Hive tests with Byzantine

16 files changed, 2885 insertions, 994 deletions

diff --git a/BlockchainTests/GeneralStateTests/stSolidityTest/AmbiguousMethod_d0g0v0.json b/BlockchainTests/GeneralStateTests/stSolidityTest/AmbiguousMethod_d0g0v0.json
index 1daf94dd2..5ef2a82f7 100644
--- a/BlockchainTests/GeneralStateTests/stSolidityTest/AmbiguousMethod_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stSolidityTest/AmbiguousMethod_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "AmbiguousMethod_d0g0v0_EIP150" : {
+    "AmbiguousMethod_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/AmbiguousMethod_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xa1a3",
-                    "hash" : "0xc44950b8116e2ac5945230848ea2e935939435fa7797c63d7993e7c02404f2d3",
-                    "mixHash" : "0x34434bbc8948b5c2f97a83a9ccdd442c3605c983e7a1e053d9b340fc2d7f5c28",
-                    "nonce" : "0x3f18f54794ced62f",
+                    "gasUsed" : "0xa1cb",
+                    "hash" : "0x426b0c05d0437ee1ebfbc69d5e72f0814b600bc021187c75595e129a65a22e61",
+                    "mixHash" : "0xb0f2f9ab23d313b699ee21ede3c30d0a3a70c9722cb10b9d21b6ac3820254b8a",
+                    "nonce" : "0x5eaf6922e432ea5e",
                     "number" : "0x01",
                     "parentHash" : "0xdc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5b",
-                    "receiptTrie" : "0xda17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4",
-                    "stateRoot" : "0xddff813485ba98dfff7482be912fbfe7aebdc4e9700eed0586d73438c1b134e3",
+                    "receiptTrie" : "0x3b9b0153cf2ec758a7e85b868ea69c083ad8dd0b2e82806b8a214cc27dc33d20",
+                    "stateRoot" : "0xc7247f11c68e4fd9fb4e582a644d65ff6e434d88c0fa7ef06f591a1f93e817c9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ddff813485ba98dfff7482be912fbfe7aebdc4e9700eed0586d73438c1b134e3a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a0da17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1a38203e880a034434bbc8948b5c2f97a83a9ccdd442c3605c983e7a1e053d9b340fc2d7f5c28883f18f54794ced62ff866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
+                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c7247f11c68e4fd9fb4e582a644d65ff6e434d88c0fa7ef06f591a1f93e817c9a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a03b9b0153cf2ec758a7e85b868ea69c083ad8dd0b2e82806b8a214cc27dc33d20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1cb8203e880a0b0f2f9ab23d313b699ee21ede3c30d0a3a70c9722cb10b9d21b6ac3820254b8a885eaf6922e432ea5ef866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a255d36649354a92f804a31c33087b6792b03cb32b880b2c22d390f08a572474a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc44950b8116e2ac5945230848ea2e935939435fa7797c63d7993e7c02404f2d3",
-        "network" : "EIP150",
+        "lastblockhash" : "0x426b0c05d0437ee1ebfbc69d5e72f0814b600bc021187c75595e129a65a22e61",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
                 "code" : "0x60003560e060020a90048063c040622614601557005b601b6021565b60006000f35b61014f60008190555056",
@@ -74,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a1a3",
+                "balance" : "0x4563918244f4a1cb",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x06ff7c",
+                "balance" : "0x06ff54",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +112,10 @@
             }
         }
     },
-    "AmbiguousMethod_d0g0v0_EIP158" : {
+    "AmbiguousMethod_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/stSolidityTest/AmbiguousMethod_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa1cb",
-                    "hash" : "0x877080fde429767d4fef6e2aedc7e7f7c414e17c335fcded2358387b94f85cbd",
-                    "mixHash" : "0x11ee2098bc38845f09ee2219496d4fb1257803e2923648dbd5135e6627c51fa0",
-                    "nonce" : "0x9470fff15ef022c2",
+                    "hash" : "0x0e59ed2758b5338c350a5185c6726fe8e94a7018096e3dffedfeb0c55e816c5f",
+                    "mixHash" : "0xea2d711ef0b9ea2ef5b79720497fef5960e3812aae73770d8d1a12c2ae73727c",
+                    "nonce" : "0xe4fa0ca45fd146e7",
                     "number" : "0x01",
                     "parentHash" : "0xdc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5b",
-                    "receiptTrie" : "0x9048c01e91e23e800d1983b005766f22740515c150a3237a60cbb999361a6d83",
-                    "stateRoot" : "0xe51eaed82e3c6e4d401700379a5af0af02ad9eb96a98865cd94c1b85cec5005b",
+                    "receiptTrie" : "0x3b9b0153cf2ec758a7e85b868ea69c083ad8dd0b2e82806b8a214cc27dc33d20",
+                    "stateRoot" : "0xc7247f11c68e4fd9fb4e582a644d65ff6e434d88c0fa7ef06f591a1f93e817c9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e51eaed82e3c6e4d401700379a5af0af02ad9eb96a98865cd94c1b85cec5005ba0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a09048c01e91e23e800d1983b005766f22740515c150a3237a60cbb999361a6d83b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1cb8203e880a011ee2098bc38845f09ee2219496d4fb1257803e2923648dbd5135e6627c51fa0889470fff15ef022c2f866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
+                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c7247f11c68e4fd9fb4e582a644d65ff6e434d88c0fa7ef06f591a1f93e817c9a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a03b9b0153cf2ec758a7e85b868ea69c083ad8dd0b2e82806b8a214cc27dc33d20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1cb8203e880a0ea2d711ef0b9ea2ef5b79720497fef5960e3812aae73770d8d1a12c2ae73727c88e4fa0ca45fd146e7f866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a255d36649354a92f804a31c33087b6792b03cb32b880b2c22d390f08a572474a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x877080fde429767d4fef6e2aedc7e7f7c414e17c335fcded2358387b94f85cbd",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0e59ed2758b5338c350a5185c6726fe8e94a7018096e3dffedfeb0c55e816c5f",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
                 "code" : "0x60003560e060020a90048063c040622614601557005b601b6021565b60006000f35b61014f60008190555056",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "AmbiguousMethod_d0g0v0_Frontier" : {
+    "AmbiguousMethod_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/AmbiguousMethod_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa1a3",
-                    "hash" : "0x09844b0e87c74ac61c1a8928f8eff0849c05fa71f7d54efc4d36f9bded5d87cb",
-                    "mixHash" : "0x5dd147f379e82a2808cfeced637ef3fac282e0fda7bd3ccac9d5ef06598bae96",
-                    "nonce" : "0xf980d8cf3c8f8f07",
+                    "hash" : "0x5b79cce665cc548e0069d3ec6867707712623f995680fac73cfed7e365e636a1",
+                    "mixHash" : "0x69065fbbf7dcc86c02b8aeab3e046377ade2d03290b1667d08170e4b0f58ee86",
+                    "nonce" : "0x0fe52b5a3f553034",
                     "number" : "0x01",
                     "parentHash" : "0xdc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5b",
                     "receiptTrie" : "0xda17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4",
@@ -237,7 +251,7 @@
                     "transactionsTrie" : "0xe94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ddff813485ba98dfff7482be912fbfe7aebdc4e9700eed0586d73438c1b134e3a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a0da17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1a38203e880a05dd147f379e82a2808cfeced637ef3fac282e0fda7bd3ccac9d5ef06598bae9688f980d8cf3c8f8f07f866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
+                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ddff813485ba98dfff7482be912fbfe7aebdc4e9700eed0586d73438c1b134e3a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a0da17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1a38203e880a069065fbbf7dcc86c02b8aeab3e046377ade2d03290b1667d08170e4b0f58ee86880fe52b5a3f553034f866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a255d36649354a92f804a31c33087b6792b03cb32b880b2c22d390f08a572474a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x09844b0e87c74ac61c1a8928f8eff0849c05fa71f7d54efc4d36f9bded5d87cb",
-        "network" : "Frontier",
+        "lastblockhash" : "0x5b79cce665cc548e0069d3ec6867707712623f995680fac73cfed7e365e636a1",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
@@ -317,10 +331,10 @@
             }
         }
     },
-    "AmbiguousMethod_d0g0v0_Homestead" : {
+    "AmbiguousMethod_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/AmbiguousMethod_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -331,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xa1a3",
-                    "hash" : "0xf45b63cd308b7046c45db164354c145c69ed7e89f02cd3749ac751e4028c08b8",
-                    "mixHash" : "0x31dddc6d684189061f291aabcc944c565bb346354f956c52bfc42fa147da2862",
-                    "nonce" : "0xd085a4f4eb06d34b",
+                    "gasUsed" : "0xa1cb",
+                    "hash" : "0x57f9169766ec55fa6f1d401a117eef8022c39fe400086cfcb05bb23ba34a55c7",
+                    "mixHash" : "0xc663c69f64447744d26d54809d88fbe58b3e477fe0540bf81f6cdba1d3352749",
+                    "nonce" : "0xe96a9ad8c7d4ae12",
                     "number" : "0x01",
                     "parentHash" : "0xdc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5b",
-                    "receiptTrie" : "0xda17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4",
-                    "stateRoot" : "0xddff813485ba98dfff7482be912fbfe7aebdc4e9700eed0586d73438c1b134e3",
+                    "receiptTrie" : "0x9048c01e91e23e800d1983b005766f22740515c150a3237a60cbb999361a6d83",
+                    "stateRoot" : "0xe51eaed82e3c6e4d401700379a5af0af02ad9eb96a98865cd94c1b85cec5005b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ddff813485ba98dfff7482be912fbfe7aebdc4e9700eed0586d73438c1b134e3a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a0da17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1a38203e880a031dddc6d684189061f291aabcc944c565bb346354f956c52bfc42fa147da286288d085a4f4eb06d34bf866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
+                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e51eaed82e3c6e4d401700379a5af0af02ad9eb96a98865cd94c1b85cec5005ba0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a09048c01e91e23e800d1983b005766f22740515c150a3237a60cbb999361a6d83b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1cb8203e880a0c663c69f64447744d26d54809d88fbe58b3e477fe0540bf81f6cdba1d335274988e96a9ad8c7d4ae12f866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a255d36649354a92f804a31c33087b6792b03cb32b880b2c22d390f08a572474a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf45b63cd308b7046c45db164354c145c69ed7e89f02cd3749ac751e4028c08b8",
-        "network" : "Homestead",
+        "lastblockhash" : "0x57f9169766ec55fa6f1d401a117eef8022c39fe400086cfcb05bb23ba34a55c7",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
@@ -392,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a1a3",
+                "balance" : "0x4563918244f4a1cb",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x06ff7c",
+                "balance" : "0x06ff54",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -423,10 +437,10 @@
             }
         }
     },
-    "AmbiguousMethod_d0g0v0_Metropolis" : {
+    "AmbiguousMethod_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/AmbiguousMethod_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +451,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xa1cb",
-                    "hash" : "0xe6a1e5b2d67f45f1f82e457d82dbaaa884f22407608913b00a0099924b45e5ad",
-                    "mixHash" : "0x91cdfef85e5afe73cd097eafeb1315eb80cb797c666e0780acb052b5621e0d16",
-                    "nonce" : "0xb81209939ebc5540",
+                    "gasUsed" : "0xa1a3",
+                    "hash" : "0x3c5ba07bbe8357306b643d382ebf1f6092530c71af694ffec60d28d59825fa07",
+                    "mixHash" : "0xbeca28f0ed2a6f257f1e9db5fa90a8663f58b9ed91c65a9a5b09e156a0c057a3",
+                    "nonce" : "0xdddf8868c2e675fc",
                     "number" : "0x01",
                     "parentHash" : "0xdc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5b",
-                    "receiptTrie" : "0x3b9b0153cf2ec758a7e85b868ea69c083ad8dd0b2e82806b8a214cc27dc33d20",
-                    "stateRoot" : "0xc7247f11c68e4fd9fb4e582a644d65ff6e434d88c0fa7ef06f591a1f93e817c9",
+                    "receiptTrie" : "0xda17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4",
+                    "stateRoot" : "0xddff813485ba98dfff7482be912fbfe7aebdc4e9700eed0586d73438c1b134e3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c7247f11c68e4fd9fb4e582a644d65ff6e434d88c0fa7ef06f591a1f93e817c9a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a03b9b0153cf2ec758a7e85b868ea69c083ad8dd0b2e82806b8a214cc27dc33d20b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1cb8203e880a091cdfef85e5afe73cd097eafeb1315eb80cb797c666e0780acb052b5621e0d1688b81209939ebc5540f866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
+                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ddff813485ba98dfff7482be912fbfe7aebdc4e9700eed0586d73438c1b134e3a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a0da17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1a38203e880a0beca28f0ed2a6f257f1e9db5fa90a8663f58b9ed91c65a9a5b09e156a0c057a388dddf8868c2e675fcf866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a255d36649354a92f804a31c33087b6792b03cb32b880b2c22d390f08a572474a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe6a1e5b2d67f45f1f82e457d82dbaaa884f22407608913b00a0099924b45e5ad",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x3c5ba07bbe8357306b643d382ebf1f6092530c71af694ffec60d28d59825fa07",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a1",
+                "code" : "0x60003560e060020a90048063c040622614601557005b601b6021565b60006000f35b61014f60008190555056",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x014f"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4a1a3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x06ff7c",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x60003560e060020a90048063c040622614601557005b601b6021565b60006000f35b61014f60008190555056",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x07a120",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "AmbiguousMethod_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/AmbiguousMethod_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xa1a3",
+                    "hash" : "0xc71aa2e3ea633527700c9506bd7747f829766d23ebbb7753be0a1f948f1cf0da",
+                    "mixHash" : "0x6b7add39a49903552b95f84dd1dcc065134747a8a3b70aaead2312ead3b51b40",
+                    "nonce" : "0xa0d8d77802922edf",
+                    "number" : "0x01",
+                    "parentHash" : "0xdc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5b",
+                    "receiptTrie" : "0xda17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4",
+                    "stateRoot" : "0xddff813485ba98dfff7482be912fbfe7aebdc4e9700eed0586d73438c1b134e3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90264f901f8a0dc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ddff813485ba98dfff7482be912fbfe7aebdc4e9700eed0586d73438c1b134e3a0e94897ffb28a465151bb91d533541d37a6a0bf8cac7b9d711257ad6d89aae671a0da17bf6d6243696d33e1e8bc9c9682f9f2137fc3c640d7d1f27919e9cf097db4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a1a38203e880a06b7add39a49903552b95f84dd1dcc065134747a8a3b70aaead2312ead3b51b4088a0d8d77802922edff866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ca006c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071a06e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441c0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x0493e0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x06c803b62d4ae5b7010a2a46ca772506d98938c5750574b8659887e4578aa071",
+                        "s" : "0x6e06232e0ab34ddce064aafeb273eff238a45b02f394ead946d5946f4213b441",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xdc81bbc6a7694b3b99755fc8b5ef4b7977a8d5bf72bb57197995c6645d1c9f5b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa255d36649354a92f804a31c33087b6792b03cb32b880b2c22d390f08a572474",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a255d36649354a92f804a31c33087b6792b03cb32b880b2c22d390f08a572474a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc71aa2e3ea633527700c9506bd7747f829766d23ebbb7753be0a1f948f1cf0da",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
                 "code" : "0x60003560e060020a90048063c040622614601557005b601b6021565b60006000f35b61014f60008190555056",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a1cb",
+                "balance" : "0x4563918244f4a1a3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x06ff54",
+                "balance" : "0x06ff7c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stSolidityTest/CallInfiniteLoop_d0g0v0.json b/BlockchainTests/GeneralStateTests/stSolidityTest/CallInfiniteLoop_d0g0v0.json
index 9ed78b689..1d4e01bc7 100644
--- a/BlockchainTests/GeneralStateTests/stSolidityTest/CallInfiniteLoop_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stSolidityTest/CallInfiniteLoop_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallInfiniteLoop_d0g0v0_EIP150" : {
+    "CallInfiniteLoop_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/CallInfiniteLoop_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0493e0",
-                    "hash" : "0x2f66f6cc8a10ac9015470c95fddd01dc11c90a6d36faa9314269886d7ec32d3a",
-                    "mixHash" : "0xc04564b8de989b1f00bed4352534d065d09f1fab994c9a3a8d75bb1de5bb99b4",
-                    "nonce" : "0x2495f59c525c25b6",
+                    "hash" : "0x828c2d9d1c95b520e122ff43f31dac8c2587aae2a5fbee452c1863f9833e368e",
+                    "mixHash" : "0x1f1f2530fd649fcec0de40c52d9f4c0cfc0f2b245d87bba78d285c8dc58d0cf3",
+                    "nonce" : "0xcf041e21c7aa7316",
                     "number" : "0x01",
                     "parentHash" : "0xaf65948b068aa5f6dd7d6b3d7169356292d1bea4e878f63c3a5e16cd988b02ac",
-                    "receiptTrie" : "0x9d8209995e44e7cdffd35272965b74847c540219648362944b21c9b0c2d32aae",
-                    "stateRoot" : "0xa88613c5e13175d1444ab3a361ea70abef57741bb58074397c744c19ac8fec10",
+                    "receiptTrie" : "0xe2a8b0fa171b989aab37eee4a349917e9c93607fc5c7b07513cf8997ec83e8bf",
+                    "stateRoot" : "0x3d741506f272c16e1fcfd7018fb5aa8c101af5968c488015f91d6b623bfeeee2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x014562a324bcd50a3be341c4141c9968e29bc3382332517037b21acf0b278349",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f9a0af65948b068aa5f6dd7d6b3d7169356292d1bea4e878f63c3a5e16cd988b02aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a88613c5e13175d1444ab3a361ea70abef57741bb58074397c744c19ac8fec10a0014562a324bcd50a3be341c4141c9968e29bc3382332517037b21acf0b278349a09d8209995e44e7cdffd35272965b74847c540219648362944b21c9b0c2d32aaeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830493e08203e880a0c04564b8de989b1f00bed4352534d065d09f1fab994c9a3a8d75bb1de5bb99b4882495f59c525c25b6f866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184296df0df1ba0740f12159ebaea0e54f0bbec0ac065245b7ccc78414f48704eba19bef21854b8a041b8ec2be1f67d03a58633df898ce0f63b512dd7ed9babf650cc3f315c18864fc0",
+                "rlp" : "0xf90265f901f9a0af65948b068aa5f6dd7d6b3d7169356292d1bea4e878f63c3a5e16cd988b02aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d741506f272c16e1fcfd7018fb5aa8c101af5968c488015f91d6b623bfeeee2a0014562a324bcd50a3be341c4141c9968e29bc3382332517037b21acf0b278349a0e2a8b0fa171b989aab37eee4a349917e9c93607fc5c7b07513cf8997ec83e8bfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830493e08203e880a01f1f2530fd649fcec0de40c52d9f4c0cfc0f2b245d87bba78d285c8dc58d0cf388cf041e21c7aa7316f866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184296df0df1ba0740f12159ebaea0e54f0bbec0ac065245b7ccc78414f48704eba19bef21854b8a041b8ec2be1f67d03a58633df898ce0f63b512dd7ed9babf650cc3f315c18864fc0",
                 "transactions" : [
                     {
                         "data" : "0x296df0df",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa024f62c43bb67a849ccdea98bc7d026f2fb7c372da9795a6fee7684477ef26a52a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2f66f6cc8a10ac9015470c95fddd01dc11c90a6d36faa9314269886d7ec32d3a",
-        "network" : "EIP150",
+        "lastblockhash" : "0x828c2d9d1c95b520e122ff43f31dac8c2587aae2a5fbee452c1863f9833e368e",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60003560e060020a90048063296df0df1460295780634893d88a146035578063981a316514604157005b602f604d565b60006000f35b603b6062565b60006000f35b6047605a565b60006000f35b5b600115605857604e565b565b60606062565b565b6068605a565b56",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "CallInfiniteLoop_d0g0v0_EIP158" : {
+    "CallInfiniteLoop_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/stSolidityTest/CallInfiniteLoop_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0493e0",
-                    "hash" : "0x5f261a3bb29af5ad8dc720d66cee4cbf14b41c7019ed3cad8096507e06d6e7de",
-                    "mixHash" : "0xbf84ab15e710cec96672dee61785a444a51eaabfb10be863a4bb621d239996df",
-                    "nonce" : "0x72b56607550a31de",
+                    "hash" : "0x9a736b5530369d54d06066fd0ffa0f3fb0a51e93cb4b25bc9f674fa7db087964",
+                    "mixHash" : "0x210925d9a36157d5a71f99faf016dd7980e321c2041c08eaaa07b71c56e0b90f",
+                    "nonce" : "0x9ded78699d2a8c66",
                     "number" : "0x01",
                     "parentHash" : "0xaf65948b068aa5f6dd7d6b3d7169356292d1bea4e878f63c3a5e16cd988b02ac",
-                    "receiptTrie" : "0x9d8209995e44e7cdffd35272965b74847c540219648362944b21c9b0c2d32aae",
-                    "stateRoot" : "0xa88613c5e13175d1444ab3a361ea70abef57741bb58074397c744c19ac8fec10",
+                    "receiptTrie" : "0xe2a8b0fa171b989aab37eee4a349917e9c93607fc5c7b07513cf8997ec83e8bf",
+                    "stateRoot" : "0x3d741506f272c16e1fcfd7018fb5aa8c101af5968c488015f91d6b623bfeeee2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x014562a324bcd50a3be341c4141c9968e29bc3382332517037b21acf0b278349",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f9a0af65948b068aa5f6dd7d6b3d7169356292d1bea4e878f63c3a5e16cd988b02aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a88613c5e13175d1444ab3a361ea70abef57741bb58074397c744c19ac8fec10a0014562a324bcd50a3be341c4141c9968e29bc3382332517037b21acf0b278349a09d8209995e44e7cdffd35272965b74847c540219648362944b21c9b0c2d32aaeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830493e08203e880a0bf84ab15e710cec96672dee61785a444a51eaabfb10be863a4bb621d239996df8872b56607550a31def866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184296df0df1ba0740f12159ebaea0e54f0bbec0ac065245b7ccc78414f48704eba19bef21854b8a041b8ec2be1f67d03a58633df898ce0f63b512dd7ed9babf650cc3f315c18864fc0",
+                "rlp" : "0xf90265f901f9a0af65948b068aa5f6dd7d6b3d7169356292d1bea4e878f63c3a5e16cd988b02aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d741506f272c16e1fcfd7018fb5aa8c101af5968c488015f91d6b623bfeeee2a0014562a324bcd50a3be341c4141c9968e29bc3382332517037b21acf0b278349a0e2a8b0fa171b989aab37eee4a349917e9c93607fc5c7b07513cf8997ec83e8bfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830493e08203e880a0210925d9a36157d5a71f99faf016dd7980e321c2041c08eaaa07b71c56e0b90f889ded78699d2a8c66f866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184296df0df1ba0740f12159ebaea0e54f0bbec0ac065245b7ccc78414f48704eba19bef21854b8a041b8ec2be1f67d03a58633df898ce0f63b512dd7ed9babf650cc3f315c18864fc0",
                 "transactions" : [
                     {
                         "data" : "0x296df0df",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa024f62c43bb67a849ccdea98bc7d026f2fb7c372da9795a6fee7684477ef26a52a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5f261a3bb29af5ad8dc720d66cee4cbf14b41c7019ed3cad8096507e06d6e7de",
-        "network" : "EIP158",
+        "lastblockhash" : "0x9a736b5530369d54d06066fd0ffa0f3fb0a51e93cb4b25bc9f674fa7db087964",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60003560e060020a90048063296df0df1460295780634893d88a146035578063981a316514604157005b602f604d565b60006000f35b603b6062565b60006000f35b6047605a565b60006000f35b5b600115605857604e565b565b60606062565b565b6068605a565b56",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "CallInfiniteLoop_d0g0v0_Frontier" : {
+    "CallInfiniteLoop_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/CallInfiniteLoop_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0493e0",
-                    "hash" : "0xd63e7e7902bda55fbba1657684d6b96a492a029903f6eac5adb6de6c93c8bdbb",
-                    "mixHash" : "0x61bdbf1c61e75f886ee54f61d1ee1bf7b32373ef859af6b752369cb94c59063f",
-                    "nonce" : "0x480d95470bb79bf9",
+                    "hash" : "0x17edaff4bab614cfc04b9067c1648deb4697f30da37851c2469807d2963f14ba",
+                    "mixHash" : "0x67bc48473e7ad196aa7e6eb197bde17fad7133c30cfa1d3cf54dffaa71cb2687",
+                    "nonce" : "0xe63bf1cdf41841cc",
                     "number" : "0x01",
                     "parentHash" : "0xaf65948b068aa5f6dd7d6b3d7169356292d1bea4e878f63c3a5e16cd988b02ac",
                     "receiptTrie" : "0x9d8209995e44e7cdffd35272965b74847c540219648362944b21c9b0c2d32aae",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0x014562a324bcd50a3be341c4141c9968e29bc3382332517037b21acf0b278349",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f9a0af65948b068aa5f6dd7d6b3d7169356292d1bea4e878f63c3a5e16cd988b02aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a88613c5e13175d1444ab3a361ea70abef57741bb58074397c744c19ac8fec10a0014562a324bcd50a3be341c4141c9968e29bc3382332517037b21acf0b278349a09d8209995e44e7cdffd35272965b74847c540219648362944b21c9b0c2d32aaeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830493e08203e880a061bdbf1c61e75f886ee54f61d1ee1bf7b32373ef859af6b752369cb94c59063f88480d95470bb79bf9f866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184296df0df1ba0740f12159ebaea0e54f0bbec0ac065245b7ccc78414f48704eba19bef21854b8a041b8ec2be1f67d03a58633df898ce0f63b512dd7ed9babf650cc3f315c18864fc0",
+                "rlp" : "0xf90265f901f9a0af65948b068aa5f6dd7d6b3d7169356292d1bea4e878f63c3a5e16cd988b02aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a88613c5e13175d1444ab3a361ea70abef57741bb58074397c744c19ac8fec10a0014562a324bcd50a3be341c4141c9968e29bc3382332517037b21acf0b278349a09d8209995e44e7cdffd35272965b74847c540219648362944b21c9b0c2d32aaeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830493e08203e880a067bc48473e7ad196aa7e6eb197bde17fad7133c30cfa1d3cf54dffaa71cb268788e63bf1cdf41841ccf866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184296df0df1ba0740f12159ebaea0e54f0bbec0ac065245b7ccc78414f48704eba19bef21854b8a041b8ec2be1f67d03a58633df898ce0f63b512dd7ed9babf650cc3f315c18864fc0",
                 "transactions" : [
                     {
                         "data" : "0x296df0df",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa024f62c43bb67a849ccdea98bc7d026f2fb7c372da9795a6fee7684477ef26a52a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd63e7e7902bda55fbba1657684d6b96a492a029903f6eac5adb6de6c93c8bdbb",
-        "network" : "Frontier",
+        "lastblockhash" : "0x17edaff4bab614cfc04b9067c1648deb4697f30da37851c2469807d2963f14ba",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "CallInfiniteLoop_d0g0v0_Homestead" : {
+    "CallInfiniteLoop_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/CallInfiniteLoop_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0493e0",
-                    "hash" : "0x3f2b34ae0722963130799a5bc248e1c74bfb839fa03c9822cbecac9fddabff17",
-                    "mixHash" : "0xdbb0d15f2488f003150347b2f07f95076c5ba43c73ef33a868ee48363dd09ef3",
-                    "nonce" : "0xb1dc8cfec41799d2",
+                    "hash" : "0x553db632f5cd48996387a36e0785bc374a48763d671cf3efe3092a8990eab851",
+                    "mixHash" : "0xc12dfe4edbdaf9615fd83a45ee3b0e21e4913ab4a72c9ff50e48f6637f4c6c3f",
+                    "nonce" : "0x4c4bdda214a61ba5",
                     "number" : "0x01",
                     "parentHash" : "0xaf65948b068aa5f6dd7d6b3d7169356292d1bea4e878f63c3a5e16cd988b02ac",
                     "receiptTrie" : "0x9d8209995e44e7cdffd35272965b74847c540219648362944b21c9b0c2d32aae",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0x014562a324bcd50a3be341c4141c9968e29bc3382332517037b21acf0b278349",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f9a0af65948b068aa5f6dd7d6b3d7169356292d1bea4e878f63c3a5e16cd988b02aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a88613c5e13175d1444ab3a361ea70abef57741bb58074397c744c19ac8fec10a0014562a324bcd50a3be341c4141c9968e29bc3382332517037b21acf0b278349a09d8209995e44e7cdffd35272965b74847c540219648362944b21c9b0c2d32aaeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830493e08203e880a0dbb0d15f2488f003150347b2f07f95076c5ba43c73ef33a868ee48363dd09ef388b1dc8cfec41799d2f866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184296df0df1ba0740f12159ebaea0e54f0bbec0ac065245b7ccc78414f48704eba19bef21854b8a041b8ec2be1f67d03a58633df898ce0f63b512dd7ed9babf650cc3f315c18864fc0",
+                "rlp" : "0xf90265f901f9a0af65948b068aa5f6dd7d6b3d7169356292d1bea4e878f63c3a5e16cd988b02aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a88613c5e13175d1444ab3a361ea70abef57741bb58074397c744c19ac8fec10a0014562a324bcd50a3be341c4141c9968e29bc3382332517037b21acf0b278349a09d8209995e44e7cdffd35272965b74847c540219648362944b21c9b0c2d32aaeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830493e08203e880a0c12dfe4edbdaf9615fd83a45ee3b0e21e4913ab4a72c9ff50e48f6637f4c6c3f884c4bdda214a61ba5f866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184296df0df1ba0740f12159ebaea0e54f0bbec0ac065245b7ccc78414f48704eba19bef21854b8a041b8ec2be1f67d03a58633df898ce0f63b512dd7ed9babf650cc3f315c18864fc0",
                 "transactions" : [
                     {
                         "data" : "0x296df0df",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa024f62c43bb67a849ccdea98bc7d026f2fb7c372da9795a6fee7684477ef26a52a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3f2b34ae0722963130799a5bc248e1c74bfb839fa03c9822cbecac9fddabff17",
-        "network" : "Homestead",
+        "lastblockhash" : "0x553db632f5cd48996387a36e0785bc374a48763d671cf3efe3092a8990eab851",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "CallInfiniteLoop_d0g0v0_Metropolis" : {
+    "CallInfiniteLoop_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/CallInfiniteLoop_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0493e0",
-                    "hash" : "0x23efad228e2606fe5f56c697c63ec3c72ff08cf135ced80e8d91e5a996a513f4",
-                    "mixHash" : "0x21d89a7645913128874c2c3f076152c37583cc035e1d8d692af099a5ddb9c3a5",
-                    "nonce" : "0xe844e61d07a64585",
+                    "hash" : "0x0a93ecf4252c9f1af8a505402a4e54e118941afc81dc336c8341385af92fddda",
+                    "mixHash" : "0x772e5bceb590fca7346ae218813c7da40e1882e60b2cf658add5210ee50d367c",
+                    "nonce" : "0x4fdc3a6e606b908c",
                     "number" : "0x01",
                     "parentHash" : "0xaf65948b068aa5f6dd7d6b3d7169356292d1bea4e878f63c3a5e16cd988b02ac",
-                    "receiptTrie" : "0xe2a8b0fa171b989aab37eee4a349917e9c93607fc5c7b07513cf8997ec83e8bf",
-                    "stateRoot" : "0x3d741506f272c16e1fcfd7018fb5aa8c101af5968c488015f91d6b623bfeeee2",
+                    "receiptTrie" : "0x9d8209995e44e7cdffd35272965b74847c540219648362944b21c9b0c2d32aae",
+                    "stateRoot" : "0xa88613c5e13175d1444ab3a361ea70abef57741bb58074397c744c19ac8fec10",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x014562a324bcd50a3be341c4141c9968e29bc3382332517037b21acf0b278349",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f9a0af65948b068aa5f6dd7d6b3d7169356292d1bea4e878f63c3a5e16cd988b02aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d741506f272c16e1fcfd7018fb5aa8c101af5968c488015f91d6b623bfeeee2a0014562a324bcd50a3be341c4141c9968e29bc3382332517037b21acf0b278349a0e2a8b0fa171b989aab37eee4a349917e9c93607fc5c7b07513cf8997ec83e8bfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830493e08203e880a021d89a7645913128874c2c3f076152c37583cc035e1d8d692af099a5ddb9c3a588e844e61d07a64585f866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184296df0df1ba0740f12159ebaea0e54f0bbec0ac065245b7ccc78414f48704eba19bef21854b8a041b8ec2be1f67d03a58633df898ce0f63b512dd7ed9babf650cc3f315c18864fc0",
+                "rlp" : "0xf90265f901f9a0af65948b068aa5f6dd7d6b3d7169356292d1bea4e878f63c3a5e16cd988b02aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a88613c5e13175d1444ab3a361ea70abef57741bb58074397c744c19ac8fec10a0014562a324bcd50a3be341c4141c9968e29bc3382332517037b21acf0b278349a09d8209995e44e7cdffd35272965b74847c540219648362944b21c9b0c2d32aaeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830493e08203e880a0772e5bceb590fca7346ae218813c7da40e1882e60b2cf658add5210ee50d367c884fdc3a6e606b908cf866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184296df0df1ba0740f12159ebaea0e54f0bbec0ac065245b7ccc78414f48704eba19bef21854b8a041b8ec2be1f67d03a58633df898ce0f63b512dd7ed9babf650cc3f315c18864fc0",
                 "transactions" : [
                     {
                         "data" : "0x296df0df",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa024f62c43bb67a849ccdea98bc7d026f2fb7c372da9795a6fee7684477ef26a52a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x23efad228e2606fe5f56c697c63ec3c72ff08cf135ced80e8d91e5a996a513f4",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x0a93ecf4252c9f1af8a505402a4e54e118941afc81dc336c8341385af92fddda",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x60003560e060020a90048063296df0df1460295780634893d88a146035578063981a316514604157005b602f604d565b60006000f35b603b6062565b60006000f35b6047605a565b60006000f35b5b600115605857604e565b565b60606062565b565b6068605a565b56",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f893e0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x030d40",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x60003560e060020a90048063296df0df1460295780634893d88a146035578063981a316514604157005b602f604d565b60006000f35b603b6062565b60006000f35b6047605a565b60006000f35b5b600115605857604e565b565b60606062565b565b6068605a565b56",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x07a120",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallInfiniteLoop_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/CallInfiniteLoop_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x0493e0",
+                    "hash" : "0xdbbef6b13bd5b5ad54e93708421cb4e9cdc13ba61ba44799955a978e76c4909c",
+                    "mixHash" : "0x33d3231213c3f305e69c033a7df78239c959b0a4456c3cc1c37243c865145f3a",
+                    "nonce" : "0x9a244c87aefcc076",
+                    "number" : "0x01",
+                    "parentHash" : "0xaf65948b068aa5f6dd7d6b3d7169356292d1bea4e878f63c3a5e16cd988b02ac",
+                    "receiptTrie" : "0x9d8209995e44e7cdffd35272965b74847c540219648362944b21c9b0c2d32aae",
+                    "stateRoot" : "0xa88613c5e13175d1444ab3a361ea70abef57741bb58074397c744c19ac8fec10",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x014562a324bcd50a3be341c4141c9968e29bc3382332517037b21acf0b278349",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90265f901f9a0af65948b068aa5f6dd7d6b3d7169356292d1bea4e878f63c3a5e16cd988b02aca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a88613c5e13175d1444ab3a361ea70abef57741bb58074397c744c19ac8fec10a0014562a324bcd50a3be341c4141c9968e29bc3382332517037b21acf0b278349a09d8209995e44e7cdffd35272965b74847c540219648362944b21c9b0c2d32aaeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830493e08203e880a033d3231213c3f305e69c033a7df78239c959b0a4456c3cc1c37243c865145f3a889a244c87aefcc076f866f8648001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d870184296df0df1ba0740f12159ebaea0e54f0bbec0ac065245b7ccc78414f48704eba19bef21854b8a041b8ec2be1f67d03a58633df898ce0f63b512dd7ed9babf650cc3f315c18864fc0",
+                "transactions" : [
+                    {
+                        "data" : "0x296df0df",
+                        "gasLimit" : "0x0493e0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x740f12159ebaea0e54f0bbec0ac065245b7ccc78414f48704eba19bef21854b8",
+                        "s" : "0x41b8ec2be1f67d03a58633df898ce0f63b512dd7ed9babf650cc3f315c18864f",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xaf65948b068aa5f6dd7d6b3d7169356292d1bea4e878f63c3a5e16cd988b02ac",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x24f62c43bb67a849ccdea98bc7d026f2fb7c372da9795a6fee7684477ef26a52",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa024f62c43bb67a849ccdea98bc7d026f2fb7c372da9795a6fee7684477ef26a52a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdbbef6b13bd5b5ad54e93708421cb4e9cdc13ba61ba44799955a978e76c4909c",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x60003560e060020a90048063296df0df1460295780634893d88a146035578063981a316514604157005b602f604d565b60006000f35b603b6062565b60006000f35b6047605a565b60006000f35b5b600115605857604e565b565b60606062565b565b6068605a565b56",
diff --git a/BlockchainTests/GeneralStateTests/stSolidityTest/CallLowLevelCreatesSolidity_d0g0v0.json b/BlockchainTests/GeneralStateTests/stSolidityTest/CallLowLevelCreatesSolidity_d0g0v0.json
index 73898766c..d5a6e3f38 100644
--- a/BlockchainTests/GeneralStateTests/stSolidityTest/CallLowLevelCreatesSolidity_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stSolidityTest/CallLowLevelCreatesSolidity_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallLowLevelCreatesSolidity_d0g0v0_EIP150" : {
+    "CallLowLevelCreatesSolidity_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/CallLowLevelCreatesSolidity_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x01d372",
-                    "hash" : "0xaa5068cb0330080bea8a9979c8d3094da02bada321f888849f85a7604be5cb3d",
-                    "mixHash" : "0xbc25ebca04ad2b82382e8203b29432c415f5c76ec74495e2782d04effa5dec44",
-                    "nonce" : "0xcc62d4e42091d784",
+                    "gasUsed" : "0x01d4b2",
+                    "hash" : "0xb35301245cfeb4816f6efd008cfeccca4eb78ab263466e40d2e1c48d963c72cb",
+                    "mixHash" : "0x836c1ab86b207d07897a81f1df94e9649677459e8108e7c6ba19adbf1d409211",
+                    "nonce" : "0x29ec2b6a2c920ed0",
                     "number" : "0x01",
                     "parentHash" : "0xa41b0b0a3c1b9ea66b3e5167025abf05fff6fd356f2eba850ff0c524b0572380",
-                    "receiptTrie" : "0xaf8a31819d86827287b88d0c46e40f4293092e2124b1a13ef39952f1405dd228",
-                    "stateRoot" : "0x736b01a2d693b619da1839712bada7e9789fa379770b50a42e290f757257df9c",
+                    "receiptTrie" : "0x18fd79c1a3a5a09581b56e87b156d189079c3fd97161718f87145a45770c3fa3",
+                    "stateRoot" : "0x5072333ea626f4d609da94b55952e26974bc9d6dd75977c9cc9fab2c29d82ab0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f9a0a41b0b0a3c1b9ea66b3e5167025abf05fff6fd356f2eba850ff0c524b0572380a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0736b01a2d693b619da1839712bada7e9789fa379770b50a42e290f757257df9ca0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0af8a31819d86827287b88d0c46e40f4293092e2124b1a13ef39952f1405dd228b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301d3728203e880a0bc25ebca04ad2b82382e8203b29432c415f5c76ec74495e2782d04effa5dec4488cc62d4e42091d784f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "rlp" : "0xf90265f901f9a0a41b0b0a3c1b9ea66b3e5167025abf05fff6fd356f2eba850ff0c524b0572380a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05072333ea626f4d609da94b55952e26974bc9d6dd75977c9cc9fab2c29d82ab0a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a018fd79c1a3a5a09581b56e87b156d189079c3fd97161718f87145a45770c3fa3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301d4b28203e880a0836c1ab86b207d07897a81f1df94e9649677459e8108e7c6ba19adbf1d4092118829ec2b6a2c920ed0f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0695e890a531c8c1af44b07b410345e2684133d3afc8b2605078e1b312d337606a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaa5068cb0330080bea8a9979c8d3094da02bada321f888849f85a7604be5cb3d",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb35301245cfeb4816f6efd008cfeccca4eb78ab263466e40d2e1c48d963c72cb",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
                 "code" : "0x60003560e060020a9004806330debb4214610021578063c04062261461003257005b61002c6004356100c7565b60006000f35b61003a610044565b8060005260206000f35b60006000600160008190555073095e7baea6a6c7c4c2dfeb977efac326af552d87600181905550606a6100d2600039606a60006000f0905080600160a060020a03166319ab453c600060008260e060020a026000526004600154600160a060020a03168152602001600060008660325a03f16100bc57005b505060005491505090565b80600081905550505600605e80600c6000396000f30060003560e060020a9004806319ab453c14601557005b601e6004356024565b60006000f35b80600160a060020a03166330debb42600060008260e060020a02600052600460e18152602001600060008660325a03f1605957005b50505056",
@@ -75,14 +82,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5d372",
+                "balance" : "0x4563918244f5d4b2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0d6ecd",
+                "balance" : "0x0d6d8d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -91,7 +98,7 @@
             "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x00",
                 "code" : "0x60003560e060020a9004806319ab453c14601557005b601e6004356024565b60006000f35b80600160a060020a03166330debb42600060008260e060020a02600052600460e18152602001600060008660325a03f1605957005b50505056",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             }
@@ -113,10 +120,10 @@
             }
         }
     },
-    "CallLowLevelCreatesSolidity_d0g0v0_EIP158" : {
+    "CallLowLevelCreatesSolidity_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/stSolidityTest/CallLowLevelCreatesSolidity_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +135,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x01d4b2",
-                    "hash" : "0x8491bb6bd757f2f9696554575c21c0bc0e996d8b9619c60fce091cd22fbc150f",
-                    "mixHash" : "0xf3fe75ac359e05cf450c50e017cd825a55edf87f8c63ec6384fc4718425c0bb8",
-                    "nonce" : "0xa8b1f67f13e004ba",
+                    "hash" : "0x85ec42f74e19591c14218ec727095f9d77513606403bb0eefb15f53ece711411",
+                    "mixHash" : "0x938b4287a57348cd1869c7572fa1e3083d3bd7835e6eac0c2eeaeb306dde04f9",
+                    "nonce" : "0x1a53fc20acad9ef1",
                     "number" : "0x01",
                     "parentHash" : "0xa41b0b0a3c1b9ea66b3e5167025abf05fff6fd356f2eba850ff0c524b0572380",
-                    "receiptTrie" : "0x7ae1ee6819fffb0508fe866b44505e54c10a9228f0336bb4d61157eb151b3b41",
-                    "stateRoot" : "0x6305e8a6b6db3f76331ed68d9f74d4e8b145fc73ffaa28df57be44b12f872d21",
+                    "receiptTrie" : "0x18fd79c1a3a5a09581b56e87b156d189079c3fd97161718f87145a45770c3fa3",
+                    "stateRoot" : "0x5072333ea626f4d609da94b55952e26974bc9d6dd75977c9cc9fab2c29d82ab0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f9a0a41b0b0a3c1b9ea66b3e5167025abf05fff6fd356f2eba850ff0c524b0572380a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06305e8a6b6db3f76331ed68d9f74d4e8b145fc73ffaa28df57be44b12f872d21a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a07ae1ee6819fffb0508fe866b44505e54c10a9228f0336bb4d61157eb151b3b41b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301d4b28203e880a0f3fe75ac359e05cf450c50e017cd825a55edf87f8c63ec6384fc4718425c0bb888a8b1f67f13e004baf866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "rlp" : "0xf90265f901f9a0a41b0b0a3c1b9ea66b3e5167025abf05fff6fd356f2eba850ff0c524b0572380a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05072333ea626f4d609da94b55952e26974bc9d6dd75977c9cc9fab2c29d82ab0a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a018fd79c1a3a5a09581b56e87b156d189079c3fd97161718f87145a45770c3fa3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301d4b28203e880a0938b4287a57348cd1869c7572fa1e3083d3bd7835e6eac0c2eeaeb306dde04f9881a53fc20acad9ef1f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -176,9 +183,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0695e890a531c8c1af44b07b410345e2684133d3afc8b2605078e1b312d337606a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8491bb6bd757f2f9696554575c21c0bc0e996d8b9619c60fce091cd22fbc150f",
-        "network" : "EIP158",
+        "lastblockhash" : "0x85ec42f74e19591c14218ec727095f9d77513606403bb0eefb15f53ece711411",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
                 "code" : "0x60003560e060020a9004806330debb4214610021578063c04062261461003257005b61002c6004356100c7565b60006000f35b61003a610044565b8060005260206000f35b60006000600160008190555073095e7baea6a6c7c4c2dfeb977efac326af552d87600181905550606a6100d2600039606a60006000f0905080600160a060020a03166319ab453c600060008260e060020a026000526004600154600160a060020a03168152602001600060008660325a03f16100bc57005b505060005491505090565b80600081905550505600605e80600c6000396000f30060003560e060020a9004806319ab453c14601557005b601e6004356024565b60006000f35b80600160a060020a03166330debb42600060008260e060020a02600052600460e18152602001600060008660325a03f1605957005b50505056",
@@ -227,10 +241,10 @@
             }
         }
     },
-    "CallLowLevelCreatesSolidity_d0g0v0_Frontier" : {
+    "CallLowLevelCreatesSolidity_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/CallLowLevelCreatesSolidity_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -241,19 +255,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x01cd1e",
-                    "hash" : "0xecba15abbfb3e83b4a5c124e2602e820f88238c9bb9337981a721f02beaa9444",
-                    "mixHash" : "0x87289db2c898f7d40f9749777fcb8a36235eb8a2a4669eb9c45f3040e45bf6d7",
-                    "nonce" : "0xdc3f26d4d4117e70",
+                    "gasUsed" : "0x01d372",
+                    "hash" : "0xda0128dd458f57cae846a99faa653267898c006f888b780a366a269245baf25c",
+                    "mixHash" : "0x5eea6d0d31f30ec6064d14be801c502bf038f5ee86acb3fe5e3da50c89745a7b",
+                    "nonce" : "0xb9d07c6f69673a6e",
                     "number" : "0x01",
                     "parentHash" : "0xa41b0b0a3c1b9ea66b3e5167025abf05fff6fd356f2eba850ff0c524b0572380",
-                    "receiptTrie" : "0xa988be1cb330acc42d8c7945e5f3d1f3557184324abe984f29760ffa414930b4",
-                    "stateRoot" : "0x0c23b5969309cc419facae52107993c7b2b1a132decbcfce21a7f4424430d792",
+                    "receiptTrie" : "0xaf8a31819d86827287b88d0c46e40f4293092e2124b1a13ef39952f1405dd228",
+                    "stateRoot" : "0x736b01a2d693b619da1839712bada7e9789fa379770b50a42e290f757257df9c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f9a0a41b0b0a3c1b9ea66b3e5167025abf05fff6fd356f2eba850ff0c524b0572380a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c23b5969309cc419facae52107993c7b2b1a132decbcfce21a7f4424430d792a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0a988be1cb330acc42d8c7945e5f3d1f3557184324abe984f29760ffa414930b4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301cd1e8203e880a087289db2c898f7d40f9749777fcb8a36235eb8a2a4669eb9c45f3040e45bf6d788dc3f26d4d4117e70f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "rlp" : "0xf90265f901f9a0a41b0b0a3c1b9ea66b3e5167025abf05fff6fd356f2eba850ff0c524b0572380a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0736b01a2d693b619da1839712bada7e9789fa379770b50a42e290f757257df9ca0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0af8a31819d86827287b88d0c46e40f4293092e2124b1a13ef39952f1405dd228b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301d3728203e880a05eea6d0d31f30ec6064d14be801c502bf038f5ee86acb3fe5e3da50c89745a7b88b9d07c6f69673a6ef866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -290,8 +304,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0695e890a531c8c1af44b07b410345e2684133d3afc8b2605078e1b312d337606a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xecba15abbfb3e83b4a5c124e2602e820f88238c9bb9337981a721f02beaa9444",
-        "network" : "Frontier",
+        "lastblockhash" : "0xda0128dd458f57cae846a99faa653267898c006f888b780a366a269245baf25c",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
@@ -303,14 +317,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5cd1e",
+                "balance" : "0x4563918244f5d372",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0d7521",
+                "balance" : "0x0d6ecd",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -341,10 +355,124 @@
             }
         }
     },
-    "CallLowLevelCreatesSolidity_d0g0v0_Homestead" : {
+    "CallLowLevelCreatesSolidity_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/CallLowLevelCreatesSolidity_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x01d4b2",
+                    "hash" : "0x475a325148f168517b04fa8a871c6650716ecbae6af10a1704fc515a5b78e037",
+                    "mixHash" : "0x1ba241169d11ae99a20e60210a280fc6831f4d35a6520866eb3c4f701687ab7b",
+                    "nonce" : "0x19a23bef79f01148",
+                    "number" : "0x01",
+                    "parentHash" : "0xa41b0b0a3c1b9ea66b3e5167025abf05fff6fd356f2eba850ff0c524b0572380",
+                    "receiptTrie" : "0x7ae1ee6819fffb0508fe866b44505e54c10a9228f0336bb4d61157eb151b3b41",
+                    "stateRoot" : "0x6305e8a6b6db3f76331ed68d9f74d4e8b145fc73ffaa28df57be44b12f872d21",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90265f901f9a0a41b0b0a3c1b9ea66b3e5167025abf05fff6fd356f2eba850ff0c524b0572380a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06305e8a6b6db3f76331ed68d9f74d4e8b145fc73ffaa28df57be44b12f872d21a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a07ae1ee6819fffb0508fe866b44505e54c10a9228f0336bb4d61157eb151b3b41b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301d4b28203e880a01ba241169d11ae99a20e60210a280fc6831f4d35a6520866eb3c4f701687ab7b8819a23bef79f01148f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x055730",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xde52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5e",
+                        "s" : "0x76154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7f",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xa41b0b0a3c1b9ea66b3e5167025abf05fff6fd356f2eba850ff0c524b0572380",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x695e890a531c8c1af44b07b410345e2684133d3afc8b2605078e1b312d337606",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0695e890a531c8c1af44b07b410345e2684133d3afc8b2605078e1b312d337606a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x475a325148f168517b04fa8a871c6650716ecbae6af10a1704fc515a5b78e037",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a1",
+                "code" : "0x60003560e060020a9004806330debb4214610021578063c04062261461003257005b61002c6004356100c7565b60006000f35b61003a610044565b8060005260206000f35b60006000600160008190555073095e7baea6a6c7c4c2dfeb977efac326af552d87600181905550606a6100d2600039606a60006000f0905080600160a060020a03166319ab453c600060008260e060020a026000526004600154600160a060020a03168152602001600060008660325a03f16100bc57005b505060005491505090565b80600081905550505600605e80600c6000396000f30060003560e060020a9004806319ab453c14601557005b601e6004356024565b60006000f35b80600160a060020a03166330debb42600060008260e060020a02600052600460e18152602001600060008660325a03f1605957005b50505056",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0xe1",
+                    "0x01" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5d4b2",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0d6d8d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
+                "balance" : "0x00",
+                "code" : "0x60003560e060020a9004806319ab453c14601557005b601e6004356024565b60006000f35b80600160a060020a03166330debb42600060008260e060020a02600052600460e18152602001600060008660325a03f1605957005b50505056",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x60003560e060020a9004806330debb4214610021578063c04062261461003257005b61002c6004356100c7565b60006000f35b61003a610044565b8060005260206000f35b60006000600160008190555073095e7baea6a6c7c4c2dfeb977efac326af552d87600181905550606a6100d2600039606a60006000f0905080600160a060020a03166319ab453c600060008260e060020a026000526004600154600160a060020a03168152602001600060008660325a03f16100bc57005b505060005491505090565b80600081905550505600605e80600c6000396000f30060003560e060020a9004806319ab453c14601557005b601e6004356024565b60006000f35b80600160a060020a03166330debb42600060008260e060020a02600052600460e18152602001600060008660325a03f1605957005b50505056",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallLowLevelCreatesSolidity_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/CallLowLevelCreatesSolidity_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -356,9 +484,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x01cd1e",
-                    "hash" : "0xadd4e1f65219f5c9796f96e706e3ce18159a3a2f71b637c343049383eeb5a641",
-                    "mixHash" : "0x09c754263701c8d70b3e8d0c118a7056714a4acf29afa7cf4510e097ce8bfe1d",
-                    "nonce" : "0x886164798fc8fd6f",
+                    "hash" : "0x1fc080417be78a9e4ee0d860e07aad2aaf305dfc4aac5bf95c92e92a80357a75",
+                    "mixHash" : "0xe5390f06cac1b66eea114a4eb2d20df8c524a088ebd7fdae2118a59a59a7ae33",
+                    "nonce" : "0x6762b82dcb3cb14b",
                     "number" : "0x01",
                     "parentHash" : "0xa41b0b0a3c1b9ea66b3e5167025abf05fff6fd356f2eba850ff0c524b0572380",
                     "receiptTrie" : "0xa988be1cb330acc42d8c7945e5f3d1f3557184324abe984f29760ffa414930b4",
@@ -367,7 +495,7 @@
                     "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f9a0a41b0b0a3c1b9ea66b3e5167025abf05fff6fd356f2eba850ff0c524b0572380a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c23b5969309cc419facae52107993c7b2b1a132decbcfce21a7f4424430d792a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0a988be1cb330acc42d8c7945e5f3d1f3557184324abe984f29760ffa414930b4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301cd1e8203e880a009c754263701c8d70b3e8d0c118a7056714a4acf29afa7cf4510e097ce8bfe1d88886164798fc8fd6ff866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "rlp" : "0xf90265f901f9a0a41b0b0a3c1b9ea66b3e5167025abf05fff6fd356f2eba850ff0c524b0572380a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c23b5969309cc419facae52107993c7b2b1a132decbcfce21a7f4424430d792a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0a988be1cb330acc42d8c7945e5f3d1f3557184324abe984f29760ffa414930b4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301cd1e8203e880a0e5390f06cac1b66eea114a4eb2d20df8c524a088ebd7fdae2118a59a59a7ae33886762b82dcb3cb14bf866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -404,8 +532,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0695e890a531c8c1af44b07b410345e2684133d3afc8b2605078e1b312d337606a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xadd4e1f65219f5c9796f96e706e3ce18159a3a2f71b637c343049383eeb5a641",
-        "network" : "Homestead",
+        "lastblockhash" : "0x1fc080417be78a9e4ee0d860e07aad2aaf305dfc4aac5bf95c92e92a80357a75",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
@@ -455,10 +583,10 @@
             }
         }
     },
-    "CallLowLevelCreatesSolidity_d0g0v0_Metropolis" : {
+    "CallLowLevelCreatesSolidity_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/stSolidityTest/CallLowLevelCreatesSolidity_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -469,19 +597,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x01d4b2",
-                    "hash" : "0x11a967e07ac5b3913017ec6a9f636484d1313480d28df6e911f860b2aaceb5d9",
-                    "mixHash" : "0xd46771125fa5c077d3a6c92566d7a678ca4ae925d9d820e6ee98615879768623",
-                    "nonce" : "0xa693b5c0b0d7c5ae",
+                    "gasUsed" : "0x01cd1e",
+                    "hash" : "0xfaa82c3093900b3a9b7b45decd8fdce1eb15d2f4f8fd86d451fd8546487a200e",
+                    "mixHash" : "0x852f15b00db3a01349ae533159d17789857ecca7f939df01ce8233c9d2bcb992",
+                    "nonce" : "0xb49d733481ef48bc",
                     "number" : "0x01",
                     "parentHash" : "0xa41b0b0a3c1b9ea66b3e5167025abf05fff6fd356f2eba850ff0c524b0572380",
-                    "receiptTrie" : "0x18fd79c1a3a5a09581b56e87b156d189079c3fd97161718f87145a45770c3fa3",
-                    "stateRoot" : "0x5072333ea626f4d609da94b55952e26974bc9d6dd75977c9cc9fab2c29d82ab0",
+                    "receiptTrie" : "0xa988be1cb330acc42d8c7945e5f3d1f3557184324abe984f29760ffa414930b4",
+                    "stateRoot" : "0x0c23b5969309cc419facae52107993c7b2b1a132decbcfce21a7f4424430d792",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f9a0a41b0b0a3c1b9ea66b3e5167025abf05fff6fd356f2eba850ff0c524b0572380a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05072333ea626f4d609da94b55952e26974bc9d6dd75977c9cc9fab2c29d82ab0a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a018fd79c1a3a5a09581b56e87b156d189079c3fd97161718f87145a45770c3fa3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301d4b28203e880a0d46771125fa5c077d3a6c92566d7a678ca4ae925d9d820e6ee9861587976862388a693b5c0b0d7c5aef866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "rlp" : "0xf90265f901f9a0a41b0b0a3c1b9ea66b3e5167025abf05fff6fd356f2eba850ff0c524b0572380a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c23b5969309cc419facae52107993c7b2b1a132decbcfce21a7f4424430d792a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0a988be1cb330acc42d8c7945e5f3d1f3557184324abe984f29760ffa414930b4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301cd1e8203e880a0852f15b00db3a01349ae533159d17789857ecca7f939df01ce8233c9d2bcb99288b49d733481ef48bcf866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -518,16 +646,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0695e890a531c8c1af44b07b410345e2684133d3afc8b2605078e1b312d337606a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x11a967e07ac5b3913017ec6a9f636484d1313480d28df6e911f860b2aaceb5d9",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xfaa82c3093900b3a9b7b45decd8fdce1eb15d2f4f8fd86d451fd8546487a200e",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
                 "code" : "0x60003560e060020a9004806330debb4214610021578063c04062261461003257005b61002c6004356100c7565b60006000f35b61003a610044565b8060005260206000f35b60006000600160008190555073095e7baea6a6c7c4c2dfeb977efac326af552d87600181905550606a6100d2600039606a60006000f0905080600160a060020a03166319ab453c600060008260e060020a026000526004600154600160a060020a03168152602001600060008660325a03f16100bc57005b505060005491505090565b80600081905550505600605e80600c6000396000f30060003560e060020a9004806319ab453c14601557005b601e6004356024565b60006000f35b80600160a060020a03166330debb42600060008260e060020a02600052600460e18152602001600060008660325a03f1605957005b50505056",
@@ -538,14 +659,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5d4b2",
+                "balance" : "0x4563918244f5cd1e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0d6d8d",
+                "balance" : "0x0d7521",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -554,7 +675,7 @@
             "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x00",
                 "code" : "0x60003560e060020a9004806319ab453c14601557005b601e6004356024565b60006000f35b80600160a060020a03166330debb42600060008260e060020a02600052600460e18152602001600060008660325a03f1605957005b50505056",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
diff --git a/BlockchainTests/GeneralStateTests/stSolidityTest/CallRecursiveMethods_d0g0v0.json b/BlockchainTests/GeneralStateTests/stSolidityTest/CallRecursiveMethods_d0g0v0.json
index 9c0a1c01b..eea9b1929 100644
--- a/BlockchainTests/GeneralStateTests/stSolidityTest/CallRecursiveMethods_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stSolidityTest/CallRecursiveMethods_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CallRecursiveMethods_d0g0v0_EIP150" : {
+    "CallRecursiveMethods_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/CallRecursiveMethods_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xea60",
-                    "hash" : "0xb7d9825569c13bcf7b040e98cced847eae7ca34c81189701e19b0dd7e52578e9",
-                    "mixHash" : "0xb96b0f40c8fe3474b490c0e2934fd4b6e8e004476765b770e9d139c7243560c9",
-                    "nonce" : "0x392084f58565f4e5",
+                    "hash" : "0x56d9e4f37952e202541a675200854f66e19f71392fb04e97d87a153d776d677c",
+                    "mixHash" : "0x2968ecaa6fed294cdcf27d844a512c2a34332bca55dc126dac8d9dedd6898577",
+                    "nonce" : "0x7c73495ac6254dea",
                     "number" : "0x01",
                     "parentHash" : "0x39074bf575766aa94ea09f80eda80ec736bc632ef72da4f50fbe0697e826e779",
-                    "receiptTrie" : "0xe6458a5ff6b534af9e21fdecfcc357f822207efa9cba247fd0be4cdb96dc3011",
-                    "stateRoot" : "0xe897d6fd98bba481a214e00bcc37fc24dac1a055625908a16c8d9711829ade1d",
+                    "receiptTrie" : "0x595998c1d9a5a64049a0d61a9e4b6bb8c69abf9c5ced72c174322a611dfd3e44",
+                    "stateRoot" : "0x9125c0f557a81cb12b0c5dbbe20f7658caf525a0d5ee1324e790ab7011b6609f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa0956528a8ca8f35bfc2e2895064a27d9634cd634de660fa24544a03d8419492",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a039074bf575766aa94ea09f80eda80ec736bc632ef72da4f50fbe0697e826e779a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e897d6fd98bba481a214e00bcc37fc24dac1a055625908a16c8d9711829ade1da0a0956528a8ca8f35bfc2e2895064a27d9634cd634de660fa24544a03d8419492a0e6458a5ff6b534af9e21fdecfcc357f822207efa9cba247fd0be4cdb96dc3011b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ea608203e880a0b96b0f40c8fe3474b490c0e2934fd4b6e8e004476765b770e9d139c7243560c988392084f58565f4e5f865f863800182ea6094095e7baea6a6c7c4c2dfeb977efac326af552d870184981a31651ba0305c68bc58a058cde8adcb8ed36f2497b763913a1883a6c003a9943cb7234b18a05cd328465918aca3f87afd38957894f00903851e829ac3574740e310e83e84c2c0",
+                "rlp" : "0xf90263f901f8a039074bf575766aa94ea09f80eda80ec736bc632ef72da4f50fbe0697e826e779a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09125c0f557a81cb12b0c5dbbe20f7658caf525a0d5ee1324e790ab7011b6609fa0a0956528a8ca8f35bfc2e2895064a27d9634cd634de660fa24544a03d8419492a0595998c1d9a5a64049a0d61a9e4b6bb8c69abf9c5ced72c174322a611dfd3e44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ea608203e880a02968ecaa6fed294cdcf27d844a512c2a34332bca55dc126dac8d9dedd6898577887c73495ac6254deaf865f863800182ea6094095e7baea6a6c7c4c2dfeb977efac326af552d870184981a31651ba0305c68bc58a058cde8adcb8ed36f2497b763913a1883a6c003a9943cb7234b18a05cd328465918aca3f87afd38957894f00903851e829ac3574740e310e83e84c2c0",
                 "transactions" : [
                     {
                         "data" : "0x981a3165",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05bcc3459d705cd75f81393e3165b7566ec717fb85cb172e43f2825cbdd556dafa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb7d9825569c13bcf7b040e98cced847eae7ca34c81189701e19b0dd7e52578e9",
-        "network" : "EIP150",
+        "lastblockhash" : "0x56d9e4f37952e202541a675200854f66e19f71392fb04e97d87a153d776d677c",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463296df0df811460415780634893d88a14604d578063981a316514605957005b60476065565b60006000f35b6053607a565b60006000f35b605f6072565b60006000f35b5b6001156070576066565b565b6078607a565b565b60806072565b56",
@@ -104,10 +111,10 @@
             }
         }
     },
-    "CallRecursiveMethods_d0g0v0_EIP158" : {
+    "CallRecursiveMethods_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/stSolidityTest/CallRecursiveMethods_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xea60",
-                    "hash" : "0x5d113be7b6eebb5c10c51eb1f3e84ea9280048c11ab7bea315e6d3259b7931ad",
-                    "mixHash" : "0x4a7f4326d7f87d04a9e395960a3ef252f0c8479a3f0d7a61a9d806d4ab5f71ab",
-                    "nonce" : "0x64614743f49b4020",
+                    "hash" : "0x49809362489708c0c40c010e7a287471d242e26632d15fe40acccc4d1efb135b",
+                    "mixHash" : "0x510edc0d9159acc0b241ea770b9c350b11bf30ac011018fc3e631cdeae8b3961",
+                    "nonce" : "0x9bab1b0d23716bfe",
                     "number" : "0x01",
                     "parentHash" : "0x39074bf575766aa94ea09f80eda80ec736bc632ef72da4f50fbe0697e826e779",
-                    "receiptTrie" : "0xe6458a5ff6b534af9e21fdecfcc357f822207efa9cba247fd0be4cdb96dc3011",
-                    "stateRoot" : "0xe897d6fd98bba481a214e00bcc37fc24dac1a055625908a16c8d9711829ade1d",
+                    "receiptTrie" : "0x595998c1d9a5a64049a0d61a9e4b6bb8c69abf9c5ced72c174322a611dfd3e44",
+                    "stateRoot" : "0x9125c0f557a81cb12b0c5dbbe20f7658caf525a0d5ee1324e790ab7011b6609f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa0956528a8ca8f35bfc2e2895064a27d9634cd634de660fa24544a03d8419492",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a039074bf575766aa94ea09f80eda80ec736bc632ef72da4f50fbe0697e826e779a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e897d6fd98bba481a214e00bcc37fc24dac1a055625908a16c8d9711829ade1da0a0956528a8ca8f35bfc2e2895064a27d9634cd634de660fa24544a03d8419492a0e6458a5ff6b534af9e21fdecfcc357f822207efa9cba247fd0be4cdb96dc3011b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ea608203e880a04a7f4326d7f87d04a9e395960a3ef252f0c8479a3f0d7a61a9d806d4ab5f71ab8864614743f49b4020f865f863800182ea6094095e7baea6a6c7c4c2dfeb977efac326af552d870184981a31651ba0305c68bc58a058cde8adcb8ed36f2497b763913a1883a6c003a9943cb7234b18a05cd328465918aca3f87afd38957894f00903851e829ac3574740e310e83e84c2c0",
+                "rlp" : "0xf90263f901f8a039074bf575766aa94ea09f80eda80ec736bc632ef72da4f50fbe0697e826e779a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09125c0f557a81cb12b0c5dbbe20f7658caf525a0d5ee1324e790ab7011b6609fa0a0956528a8ca8f35bfc2e2895064a27d9634cd634de660fa24544a03d8419492a0595998c1d9a5a64049a0d61a9e4b6bb8c69abf9c5ced72c174322a611dfd3e44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ea608203e880a0510edc0d9159acc0b241ea770b9c350b11bf30ac011018fc3e631cdeae8b3961889bab1b0d23716bfef865f863800182ea6094095e7baea6a6c7c4c2dfeb977efac326af552d870184981a31651ba0305c68bc58a058cde8adcb8ed36f2497b763913a1883a6c003a9943cb7234b18a05cd328465918aca3f87afd38957894f00903851e829ac3574740e310e83e84c2c0",
                 "transactions" : [
                     {
                         "data" : "0x981a3165",
@@ -167,9 +174,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05bcc3459d705cd75f81393e3165b7566ec717fb85cb172e43f2825cbdd556dafa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5d113be7b6eebb5c10c51eb1f3e84ea9280048c11ab7bea315e6d3259b7931ad",
-        "network" : "EIP158",
+        "lastblockhash" : "0x49809362489708c0c40c010e7a287471d242e26632d15fe40acccc4d1efb135b",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463296df0df811460415780634893d88a14604d578063981a316514605957005b60476065565b60006000f35b6053607a565b60006000f35b605f6072565b60006000f35b5b6001156070576066565b565b6078607a565b565b60806072565b56",
@@ -209,10 +223,10 @@
             }
         }
     },
-    "CallRecursiveMethods_d0g0v0_Frontier" : {
+    "CallRecursiveMethods_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/CallRecursiveMethods_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xea60",
-                    "hash" : "0x79564de58cb3ed8105a436025a84c591c91385e038368b12ee93d5cc88951b29",
-                    "mixHash" : "0xb85f9a89396a045e8b4bb9ddc5ae3caa1d24fa18ee6e9df51d87ae0044f40a33",
-                    "nonce" : "0xa0b8b9051c8807e2",
+                    "hash" : "0x0427872d6fe06382cc6033a3bb3e757110b7240e56edae8f92af213f6d700ae4",
+                    "mixHash" : "0xeb99d1ffcfb4c296e4bab7c822e5568a6a1b8cc0454b589ad2b47f9809c31018",
+                    "nonce" : "0x5f39696f7c624439",
                     "number" : "0x01",
                     "parentHash" : "0x39074bf575766aa94ea09f80eda80ec736bc632ef72da4f50fbe0697e826e779",
                     "receiptTrie" : "0xe6458a5ff6b534af9e21fdecfcc357f822207efa9cba247fd0be4cdb96dc3011",
@@ -235,7 +249,7 @@
                     "transactionsTrie" : "0xa0956528a8ca8f35bfc2e2895064a27d9634cd634de660fa24544a03d8419492",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a039074bf575766aa94ea09f80eda80ec736bc632ef72da4f50fbe0697e826e779a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e897d6fd98bba481a214e00bcc37fc24dac1a055625908a16c8d9711829ade1da0a0956528a8ca8f35bfc2e2895064a27d9634cd634de660fa24544a03d8419492a0e6458a5ff6b534af9e21fdecfcc357f822207efa9cba247fd0be4cdb96dc3011b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ea608203e880a0b85f9a89396a045e8b4bb9ddc5ae3caa1d24fa18ee6e9df51d87ae0044f40a3388a0b8b9051c8807e2f865f863800182ea6094095e7baea6a6c7c4c2dfeb977efac326af552d870184981a31651ba0305c68bc58a058cde8adcb8ed36f2497b763913a1883a6c003a9943cb7234b18a05cd328465918aca3f87afd38957894f00903851e829ac3574740e310e83e84c2c0",
+                "rlp" : "0xf90263f901f8a039074bf575766aa94ea09f80eda80ec736bc632ef72da4f50fbe0697e826e779a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e897d6fd98bba481a214e00bcc37fc24dac1a055625908a16c8d9711829ade1da0a0956528a8ca8f35bfc2e2895064a27d9634cd634de660fa24544a03d8419492a0e6458a5ff6b534af9e21fdecfcc357f822207efa9cba247fd0be4cdb96dc3011b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ea608203e880a0eb99d1ffcfb4c296e4bab7c822e5568a6a1b8cc0454b589ad2b47f9809c31018885f39696f7c624439f865f863800182ea6094095e7baea6a6c7c4c2dfeb977efac326af552d870184981a31651ba0305c68bc58a058cde8adcb8ed36f2497b763913a1883a6c003a9943cb7234b18a05cd328465918aca3f87afd38957894f00903851e829ac3574740e310e83e84c2c0",
                 "transactions" : [
                     {
                         "data" : "0x981a3165",
@@ -272,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05bcc3459d705cd75f81393e3165b7566ec717fb85cb172e43f2825cbdd556dafa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x79564de58cb3ed8105a436025a84c591c91385e038368b12ee93d5cc88951b29",
-        "network" : "Frontier",
+        "lastblockhash" : "0x0427872d6fe06382cc6033a3bb3e757110b7240e56edae8f92af213f6d700ae4",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
@@ -314,10 +328,10 @@
             }
         }
     },
-    "CallRecursiveMethods_d0g0v0_Homestead" : {
+    "CallRecursiveMethods_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/CallRecursiveMethods_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +343,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xea60",
-                    "hash" : "0x46964d51656f39dbcece3765b4d94a5e9468cb5b3a3b4544c1babff42ebb88ce",
-                    "mixHash" : "0x3f47ae9db6b647659d6b0fd067592b1b458ac6175217d37d25241df682a3a991",
-                    "nonce" : "0x1a1ea20d899670fb",
+                    "hash" : "0x89737d38170f358cdefb956cda438134ab8fc03ce9f76639fad704f297234a69",
+                    "mixHash" : "0x74224cb157344e3d832ec82d74d8b43de564aaad43ca35cd77c9accefe468cbe",
+                    "nonce" : "0x144e61930bc036ae",
                     "number" : "0x01",
                     "parentHash" : "0x39074bf575766aa94ea09f80eda80ec736bc632ef72da4f50fbe0697e826e779",
                     "receiptTrie" : "0xe6458a5ff6b534af9e21fdecfcc357f822207efa9cba247fd0be4cdb96dc3011",
@@ -340,7 +354,7 @@
                     "transactionsTrie" : "0xa0956528a8ca8f35bfc2e2895064a27d9634cd634de660fa24544a03d8419492",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a039074bf575766aa94ea09f80eda80ec736bc632ef72da4f50fbe0697e826e779a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e897d6fd98bba481a214e00bcc37fc24dac1a055625908a16c8d9711829ade1da0a0956528a8ca8f35bfc2e2895064a27d9634cd634de660fa24544a03d8419492a0e6458a5ff6b534af9e21fdecfcc357f822207efa9cba247fd0be4cdb96dc3011b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ea608203e880a03f47ae9db6b647659d6b0fd067592b1b458ac6175217d37d25241df682a3a991881a1ea20d899670fbf865f863800182ea6094095e7baea6a6c7c4c2dfeb977efac326af552d870184981a31651ba0305c68bc58a058cde8adcb8ed36f2497b763913a1883a6c003a9943cb7234b18a05cd328465918aca3f87afd38957894f00903851e829ac3574740e310e83e84c2c0",
+                "rlp" : "0xf90263f901f8a039074bf575766aa94ea09f80eda80ec736bc632ef72da4f50fbe0697e826e779a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e897d6fd98bba481a214e00bcc37fc24dac1a055625908a16c8d9711829ade1da0a0956528a8ca8f35bfc2e2895064a27d9634cd634de660fa24544a03d8419492a0e6458a5ff6b534af9e21fdecfcc357f822207efa9cba247fd0be4cdb96dc3011b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ea608203e880a074224cb157344e3d832ec82d74d8b43de564aaad43ca35cd77c9accefe468cbe88144e61930bc036aef865f863800182ea6094095e7baea6a6c7c4c2dfeb977efac326af552d870184981a31651ba0305c68bc58a058cde8adcb8ed36f2497b763913a1883a6c003a9943cb7234b18a05cd328465918aca3f87afd38957894f00903851e829ac3574740e310e83e84c2c0",
                 "transactions" : [
                     {
                         "data" : "0x981a3165",
@@ -377,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05bcc3459d705cd75f81393e3165b7566ec717fb85cb172e43f2825cbdd556dafa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x46964d51656f39dbcece3765b4d94a5e9468cb5b3a3b4544c1babff42ebb88ce",
-        "network" : "Homestead",
+        "lastblockhash" : "0x89737d38170f358cdefb956cda438134ab8fc03ce9f76639fad704f297234a69",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
@@ -419,10 +433,10 @@
             }
         }
     },
-    "CallRecursiveMethods_d0g0v0_Metropolis" : {
+    "CallRecursiveMethods_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/CallRecursiveMethods_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -434,18 +448,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xea60",
-                    "hash" : "0x71e557c5bdb8347d2b7ce4867e5673e0a569014dae14b129d2719b1c573594e0",
-                    "mixHash" : "0x2d8e68548195b28c85495bd6f0548d98fc7bd0c1cbe72e710a7b76548c4ae1f3",
-                    "nonce" : "0x00604f05e367a195",
+                    "hash" : "0x3bac64d358f476bc443fda21a3e98739047a14f88467845d3ec91ab233af8525",
+                    "mixHash" : "0xa3280cf374bc8fbc2c45bd8a21aad40175ce100f4a6599a11d9a95c48364ae28",
+                    "nonce" : "0xb935a096634e64cc",
                     "number" : "0x01",
                     "parentHash" : "0x39074bf575766aa94ea09f80eda80ec736bc632ef72da4f50fbe0697e826e779",
-                    "receiptTrie" : "0x595998c1d9a5a64049a0d61a9e4b6bb8c69abf9c5ced72c174322a611dfd3e44",
-                    "stateRoot" : "0x9125c0f557a81cb12b0c5dbbe20f7658caf525a0d5ee1324e790ab7011b6609f",
+                    "receiptTrie" : "0xe6458a5ff6b534af9e21fdecfcc357f822207efa9cba247fd0be4cdb96dc3011",
+                    "stateRoot" : "0xe897d6fd98bba481a214e00bcc37fc24dac1a055625908a16c8d9711829ade1d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xa0956528a8ca8f35bfc2e2895064a27d9634cd634de660fa24544a03d8419492",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a039074bf575766aa94ea09f80eda80ec736bc632ef72da4f50fbe0697e826e779a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09125c0f557a81cb12b0c5dbbe20f7658caf525a0d5ee1324e790ab7011b6609fa0a0956528a8ca8f35bfc2e2895064a27d9634cd634de660fa24544a03d8419492a0595998c1d9a5a64049a0d61a9e4b6bb8c69abf9c5ced72c174322a611dfd3e44b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ea608203e880a02d8e68548195b28c85495bd6f0548d98fc7bd0c1cbe72e710a7b76548c4ae1f38800604f05e367a195f865f863800182ea6094095e7baea6a6c7c4c2dfeb977efac326af552d870184981a31651ba0305c68bc58a058cde8adcb8ed36f2497b763913a1883a6c003a9943cb7234b18a05cd328465918aca3f87afd38957894f00903851e829ac3574740e310e83e84c2c0",
+                "rlp" : "0xf90263f901f8a039074bf575766aa94ea09f80eda80ec736bc632ef72da4f50fbe0697e826e779a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e897d6fd98bba481a214e00bcc37fc24dac1a055625908a16c8d9711829ade1da0a0956528a8ca8f35bfc2e2895064a27d9634cd634de660fa24544a03d8419492a0e6458a5ff6b534af9e21fdecfcc357f822207efa9cba247fd0be4cdb96dc3011b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ea608203e880a0a3280cf374bc8fbc2c45bd8a21aad40175ce100f4a6599a11d9a95c48364ae2888b935a096634e64ccf865f863800182ea6094095e7baea6a6c7c4c2dfeb977efac326af552d870184981a31651ba0305c68bc58a058cde8adcb8ed36f2497b763913a1883a6c003a9943cb7234b18a05cd328465918aca3f87afd38957894f00903851e829ac3574740e310e83e84c2c0",
                 "transactions" : [
                     {
                         "data" : "0x981a3165",
@@ -482,16 +496,114 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05bcc3459d705cd75f81393e3165b7566ec717fb85cb172e43f2825cbdd556dafa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x71e557c5bdb8347d2b7ce4867e5673e0a569014dae14b129d2719b1c573594e0",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x3bac64d358f476bc443fda21a3e98739047a14f88467845d3ec91ab233af8525",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463296df0df811460415780634893d88a14604d578063981a316514605957005b60476065565b60006000f35b6053607a565b60006000f35b605f6072565b60006000f35b5b6001156070576066565b565b6078607a565b565b60806072565b56",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ea60",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x06b6c0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463296df0df811460415780634893d88a14604d578063981a316514605957005b60476065565b60006000f35b6053607a565b60006000f35b605f6072565b60006000f35b5b6001156070576066565b565b6078607a565b565b60806072565b56",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x07a120",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CallRecursiveMethods_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/CallRecursiveMethods_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xea60",
+                    "hash" : "0x74732ab9498e6f8ed60a85c6bfcd6a37f095e59d71b80630166c9709ff522be1",
+                    "mixHash" : "0x850024237400abb7572bb2610574d6cda3b5b4ea1e834cf068aca548aad0f9b6",
+                    "nonce" : "0xde148d48046000bd",
+                    "number" : "0x01",
+                    "parentHash" : "0x39074bf575766aa94ea09f80eda80ec736bc632ef72da4f50fbe0697e826e779",
+                    "receiptTrie" : "0xe6458a5ff6b534af9e21fdecfcc357f822207efa9cba247fd0be4cdb96dc3011",
+                    "stateRoot" : "0xe897d6fd98bba481a214e00bcc37fc24dac1a055625908a16c8d9711829ade1d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa0956528a8ca8f35bfc2e2895064a27d9634cd634de660fa24544a03d8419492",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f8a039074bf575766aa94ea09f80eda80ec736bc632ef72da4f50fbe0697e826e779a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e897d6fd98bba481a214e00bcc37fc24dac1a055625908a16c8d9711829ade1da0a0956528a8ca8f35bfc2e2895064a27d9634cd634de660fa24544a03d8419492a0e6458a5ff6b534af9e21fdecfcc357f822207efa9cba247fd0be4cdb96dc3011b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082ea608203e880a0850024237400abb7572bb2610574d6cda3b5b4ea1e834cf068aca548aad0f9b688de148d48046000bdf865f863800182ea6094095e7baea6a6c7c4c2dfeb977efac326af552d870184981a31651ba0305c68bc58a058cde8adcb8ed36f2497b763913a1883a6c003a9943cb7234b18a05cd328465918aca3f87afd38957894f00903851e829ac3574740e310e83e84c2c0",
+                "transactions" : [
+                    {
+                        "data" : "0x981a3165",
+                        "gasLimit" : "0xea60",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x305c68bc58a058cde8adcb8ed36f2497b763913a1883a6c003a9943cb7234b18",
+                        "s" : "0x5cd328465918aca3f87afd38957894f00903851e829ac3574740e310e83e84c2",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x39074bf575766aa94ea09f80eda80ec736bc632ef72da4f50fbe0697e826e779",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5bcc3459d705cd75f81393e3165b7566ec717fb85cb172e43f2825cbdd556daf",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05bcc3459d705cd75f81393e3165b7566ec717fb85cb172e43f2825cbdd556dafa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x74732ab9498e6f8ed60a85c6bfcd6a37f095e59d71b80630166c9709ff522be1",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463296df0df811460415780634893d88a14604d578063981a316514605957005b60476065565b60006000f35b6053607a565b60006000f35b605f6072565b60006000f35b5b6001156070576066565b565b6078607a565b565b60806072565b56",
diff --git a/BlockchainTests/GeneralStateTests/stSolidityTest/ContractInheritance_d0g0v0.json b/BlockchainTests/GeneralStateTests/stSolidityTest/ContractInheritance_d0g0v0.json
index 338e96aee..5eaba996e 100644
--- a/BlockchainTests/GeneralStateTests/stSolidityTest/ContractInheritance_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stSolidityTest/ContractInheritance_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "ContractInheritance_d0g0v0_EIP150" : {
+    "ContractInheritance_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/ContractInheritance_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x01fd16",
-                    "hash" : "0x5ed9261e5f5d2efc0c426b364ff7853fe25cd46e3beeb95cea98bfab08afb517",
-                    "mixHash" : "0x7432b98dd130fa5c8bb65b6a3817bbdcaf0a5cbb190e08f8213c4175055afa4e",
-                    "nonce" : "0x027460e041582c82",
+                    "hash" : "0xc5c34669d7494186881f8f3a538278b72731d6fe2727e5cbd843a760a091de6b",
+                    "mixHash" : "0xc9612379a0e9b8037b820c4d0fc681d350b9277ca0d9a01fc383060d94990e89",
+                    "nonce" : "0x1b5b3757a85384b2",
                     "number" : "0x01",
                     "parentHash" : "0xb518fab5d6c8b367d44476d2205c8f0e818e4901c7a391f980eccf6b1f0d3042",
-                    "receiptTrie" : "0x41e3a4a5aa270076c3fa1553a3e8475653a0b80c6cba6f927d3de8bfc28a72c4",
-                    "stateRoot" : "0xaf07cc05bab8e5249b0b82fc7cc6e7662ad8b5c1aa3223f9c324d7007d30f5bd",
+                    "receiptTrie" : "0x1e97fb2666e17a64f7d80fea5cf855e4517049523d7a6a7fbd83298cb961df97",
+                    "stateRoot" : "0xbb79d90c09e48c96cfc9ca284709787cb0ab8d379c6d0bff221c952d518e6a0b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0b518fab5d6c8b367d44476d2205c8f0e818e4901c7a391f980eccf6b1f0d3042a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0af07cc05bab8e5249b0b82fc7cc6e7662ad8b5c1aa3223f9c324d7007d30f5bda07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a041e3a4a5aa270076c3fa1553a3e8475653a0b80c6cba6f927d3de8bfc28a72c4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301fd168203e880a07432b98dd130fa5c8bb65b6a3817bbdcaf0a5cbb190e08f8213c4175055afa4e88027460e041582c82f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
+                "rlp" : "0xf9026af901fda0b518fab5d6c8b367d44476d2205c8f0e818e4901c7a391f980eccf6b1f0d3042a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb79d90c09e48c96cfc9ca284709787cb0ab8d379c6d0bff221c952d518e6a0ba07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a01e97fb2666e17a64f7d80fea5cf855e4517049523d7a6a7fbd83298cb961df97b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301fd168203e880a0c9612379a0e9b8037b820c4d0fc681d350b9277ca0d9a01fc383060d94990e89881b5b3757a85384b2f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0541e90277b6d53ec0b6d69b093e16bfdbc841846cb08c62ee7d581554a0ddbc0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5ed9261e5f5d2efc0c426b364ff7853fe25cd46e3beeb95cea98bfab08afb517",
-        "network" : "EIP150",
+        "lastblockhash" : "0xc5c34669d7494186881f8f3a538278b72731d6fe2727e5cbd843a760a091de6b",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x7c010000000000000000000000000000000000000000000000000000000060003504633e0bca3b8114610039578063c0406226146100a857005b6100b55b600160008060456101ec8339604560006000f091508173ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f161011957005b6100bf60006100c961003d565b8060005260206000f35b8060005260206000f35b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016919091179081905560ff16919050565b505060005163ffffffff166002141561019d575b5b505090565b505060005163ffffffff1660011415610194575b60456101a7600039604560006000f090508073ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f16100ff57005b60009250610114565b600092506101145600603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60026000818152602090f3603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60016000818152602090f3",
@@ -90,14 +97,14 @@
             "0xb88de88b35ecbf3c141e3caae2baf35834d18f63" : {
                 "balance" : "0x00",
                 "code" : "0x7c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60026000818152602090f3",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x00",
                 "code" : "0x7c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60016000818152602090f3",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             }
@@ -119,10 +126,10 @@
             }
         }
     },
-    "ContractInheritance_d0g0v0_EIP158" : {
+    "ContractInheritance_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/stSolidityTest/ContractInheritance_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -134,18 +141,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x01fd16",
-                    "hash" : "0xefb72f55171088da2350b1db260554c53902aac76176d100f46701988bd591cb",
-                    "mixHash" : "0xf6d06501e34773296c08c977a18b22510a1ddd1bcd85bb3c4dd5ac926adbaaef",
-                    "nonce" : "0x358ecb300b37b646",
+                    "hash" : "0x5298c0c46297f0f5422035989b90ddb42c7393c9f0351afc40dd7b97a1016540",
+                    "mixHash" : "0x98befa76fe261b5a4a2d8451a4ab2af795962f0936819dc6863d542b2fbc3b63",
+                    "nonce" : "0x3655a60c778ef6c7",
                     "number" : "0x01",
                     "parentHash" : "0xb518fab5d6c8b367d44476d2205c8f0e818e4901c7a391f980eccf6b1f0d3042",
-                    "receiptTrie" : "0xe46911147001b516de422ce8e07021731d187b941610b99db26afd695efe584f",
-                    "stateRoot" : "0x34ab63eaaffd5ace103b8e906ec81c2faa3c16761527b1fbfaf57dba314386aa",
+                    "receiptTrie" : "0x1e97fb2666e17a64f7d80fea5cf855e4517049523d7a6a7fbd83298cb961df97",
+                    "stateRoot" : "0xbb79d90c09e48c96cfc9ca284709787cb0ab8d379c6d0bff221c952d518e6a0b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0b518fab5d6c8b367d44476d2205c8f0e818e4901c7a391f980eccf6b1f0d3042a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa034ab63eaaffd5ace103b8e906ec81c2faa3c16761527b1fbfaf57dba314386aaa07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0e46911147001b516de422ce8e07021731d187b941610b99db26afd695efe584fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301fd168203e880a0f6d06501e34773296c08c977a18b22510a1ddd1bcd85bb3c4dd5ac926adbaaef88358ecb300b37b646f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
+                "rlp" : "0xf9026af901fda0b518fab5d6c8b367d44476d2205c8f0e818e4901c7a391f980eccf6b1f0d3042a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb79d90c09e48c96cfc9ca284709787cb0ab8d379c6d0bff221c952d518e6a0ba07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a01e97fb2666e17a64f7d80fea5cf855e4517049523d7a6a7fbd83298cb961df97b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301fd168203e880a098befa76fe261b5a4a2d8451a4ab2af795962f0936819dc6863d542b2fbc3b63883655a60c778ef6c7f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -182,9 +189,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0541e90277b6d53ec0b6d69b093e16bfdbc841846cb08c62ee7d581554a0ddbc0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xefb72f55171088da2350b1db260554c53902aac76176d100f46701988bd591cb",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5298c0c46297f0f5422035989b90ddb42c7393c9f0351afc40dd7b97a1016540",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x7c010000000000000000000000000000000000000000000000000000000060003504633e0bca3b8114610039578063c0406226146100a857005b6100b55b600160008060456101ec8339604560006000f091508173ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f161011957005b6100bf60006100c961003d565b8060005260206000f35b8060005260206000f35b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016919091179081905560ff16919050565b505060005163ffffffff166002141561019d575b5b505090565b505060005163ffffffff1660011415610194575b60456101a7600039604560006000f090508073ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f16100ff57005b60009250610114565b600092506101145600603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60026000818152602090f3603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60016000818152602090f3",
@@ -239,10 +253,10 @@
             }
         }
     },
-    "ContractInheritance_d0g0v0_Frontier" : {
+    "ContractInheritance_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/ContractInheritance_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -253,19 +267,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x01f758",
-                    "hash" : "0xcb2890f745cd16a7ea869d4c99defb204396f868c76fd0ce4d85f8c54230e176",
-                    "mixHash" : "0xc69c73b5424928df600bf2ffebc96bd7b6bb21458f98af49c9631eab8705749b",
-                    "nonce" : "0xaaa99d16db15c558",
+                    "gasUsed" : "0x01fd16",
+                    "hash" : "0x46b920a8c0241ba7d832d701ba4b7a39d451d16d87a50227ef3a6ee6b03eeb3e",
+                    "mixHash" : "0xc51902cd81531b8e04fa1542052af87ff4c5f84b1dcacb6b6b8b0842cb88c3d6",
+                    "nonce" : "0x541da663a0c85a1a",
                     "number" : "0x01",
                     "parentHash" : "0xb518fab5d6c8b367d44476d2205c8f0e818e4901c7a391f980eccf6b1f0d3042",
-                    "receiptTrie" : "0xba92d09ff81435d0e161939af89cc03e20d9a61fa6ba0afcd2a6007c56313026",
-                    "stateRoot" : "0x36060e2a269c37384fd2a993c2bf1086ab3f78b73051562b8e9384cec22f0186",
+                    "receiptTrie" : "0x41e3a4a5aa270076c3fa1553a3e8475653a0b80c6cba6f927d3de8bfc28a72c4",
+                    "stateRoot" : "0xaf07cc05bab8e5249b0b82fc7cc6e7662ad8b5c1aa3223f9c324d7007d30f5bd",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0b518fab5d6c8b367d44476d2205c8f0e818e4901c7a391f980eccf6b1f0d3042a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036060e2a269c37384fd2a993c2bf1086ab3f78b73051562b8e9384cec22f0186a07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0ba92d09ff81435d0e161939af89cc03e20d9a61fa6ba0afcd2a6007c56313026b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301f7588203e880a0c69c73b5424928df600bf2ffebc96bd7b6bb21458f98af49c9631eab8705749b88aaa99d16db15c558f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
+                "rlp" : "0xf9026af901fda0b518fab5d6c8b367d44476d2205c8f0e818e4901c7a391f980eccf6b1f0d3042a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0af07cc05bab8e5249b0b82fc7cc6e7662ad8b5c1aa3223f9c324d7007d30f5bda07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a041e3a4a5aa270076c3fa1553a3e8475653a0b80c6cba6f927d3de8bfc28a72c4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301fd168203e880a0c51902cd81531b8e04fa1542052af87ff4c5f84b1dcacb6b6b8b0842cb88c3d688541da663a0c85a1af867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -302,8 +316,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0541e90277b6d53ec0b6d69b093e16bfdbc841846cb08c62ee7d581554a0ddbc0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcb2890f745cd16a7ea869d4c99defb204396f868c76fd0ce4d85f8c54230e176",
-        "network" : "Frontier",
+        "lastblockhash" : "0x46b920a8c0241ba7d832d701ba4b7a39d451d16d87a50227ef3a6ee6b03eeb3e",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
@@ -314,14 +328,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5f758",
+                "balance" : "0x4563918244f5fd16",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x02f8f928",
+                "balance" : "0x02f8f36a",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -359,10 +373,130 @@
             }
         }
     },
-    "ContractInheritance_d0g0v0_Homestead" : {
+    "ContractInheritance_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/ContractInheritance_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x01fd16",
+                    "hash" : "0xcc144f29065fcc8da3ec1f910650dd7d8a5d9adf5dc1ac69d4d1ffcf1ab4ddb8",
+                    "mixHash" : "0x95428510af85f3edec2d59f338f10be34a437a63aaf2587becd79d18f96dc643",
+                    "nonce" : "0x8017f6539d96fb09",
+                    "number" : "0x01",
+                    "parentHash" : "0xb518fab5d6c8b367d44476d2205c8f0e818e4901c7a391f980eccf6b1f0d3042",
+                    "receiptTrie" : "0xe46911147001b516de422ce8e07021731d187b941610b99db26afd695efe584f",
+                    "stateRoot" : "0x34ab63eaaffd5ace103b8e906ec81c2faa3c16761527b1fbfaf57dba314386aa",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9026af901fda0b518fab5d6c8b367d44476d2205c8f0e818e4901c7a391f980eccf6b1f0d3042a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa034ab63eaaffd5ace103b8e906ec81c2faa3c16761527b1fbfaf57dba314386aaa07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0e46911147001b516de422ce8e07021731d187b941610b99db26afd695efe584fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301fd168203e880a095428510af85f3edec2d59f338f10be34a437a63aaf2587becd79d18f96dc643888017f6539d96fb09f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x02160ec0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fe",
+                        "s" : "0x479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0xb518fab5d6c8b367d44476d2205c8f0e818e4901c7a391f980eccf6b1f0d3042",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x541e90277b6d53ec0b6d69b093e16bfdbc841846cb08c62ee7d581554a0ddbc0",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0541e90277b6d53ec0b6d69b093e16bfdbc841846cb08c62ee7d581554a0ddbc0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcc144f29065fcc8da3ec1f910650dd7d8a5d9adf5dc1ac69d4d1ffcf1ab4ddb8",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x7c010000000000000000000000000000000000000000000000000000000060003504633e0bca3b8114610039578063c0406226146100a857005b6100b55b600160008060456101ec8339604560006000f091508173ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f161011957005b6100bf60006100c961003d565b8060005260206000f35b8060005260206000f35b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016919091179081905560ff16919050565b505060005163ffffffff166002141561019d575b5b505090565b505060005163ffffffff1660011415610194575b60456101a7600039604560006000f090508073ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f16100ff57005b60009250610114565b600092506101145600603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60026000818152602090f3603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60016000818152602090f3",
+                "nonce" : "0x02",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5fd16",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x02f8f36a",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb88de88b35ecbf3c141e3caae2baf35834d18f63" : {
+                "balance" : "0x00",
+                "code" : "0x7c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60026000818152602090f3",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
+                "balance" : "0x00",
+                "code" : "0x7c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60016000818152602090f3",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x7c010000000000000000000000000000000000000000000000000000000060003504633e0bca3b8114610039578063c0406226146100a857005b6100b55b600160008060456101ec8339604560006000f091508173ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f161011957005b6100bf60006100c961003d565b8060005260206000f35b8060005260206000f35b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016919091179081905560ff16919050565b505060005163ffffffff166002141561019d575b5b505090565b505060005163ffffffff1660011415610194575b60456101a7600039604560006000f090508073ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f16100ff57005b60009250610114565b600092506101145600603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60026000818152602090f3603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60016000818152602090f3",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x02faf080",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "ContractInheritance_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/ContractInheritance_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -374,9 +508,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x01f758",
-                    "hash" : "0x37461a911b67511e647002a2304588bdb449546f47a188615b0419a4e2778031",
-                    "mixHash" : "0xaba3ac5e0ca6b24f5a259ee8f242376e4431e7ad18fff676240cd1da4b69c26c",
-                    "nonce" : "0x027edc4939b8cb71",
+                    "hash" : "0x89c67077eb2517e9816c6e5b2bd7dbefcab875b3b311f79b967728137111275b",
+                    "mixHash" : "0x70ee335f9e159ac99fcb2fa0d15a4a79a15cdf37aa56ff277b91fc940d3ce598",
+                    "nonce" : "0x7967c5fc67ebfcbd",
                     "number" : "0x01",
                     "parentHash" : "0xb518fab5d6c8b367d44476d2205c8f0e818e4901c7a391f980eccf6b1f0d3042",
                     "receiptTrie" : "0xba92d09ff81435d0e161939af89cc03e20d9a61fa6ba0afcd2a6007c56313026",
@@ -385,7 +519,7 @@
                     "transactionsTrie" : "0x7ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0b518fab5d6c8b367d44476d2205c8f0e818e4901c7a391f980eccf6b1f0d3042a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036060e2a269c37384fd2a993c2bf1086ab3f78b73051562b8e9384cec22f0186a07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0ba92d09ff81435d0e161939af89cc03e20d9a61fa6ba0afcd2a6007c56313026b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301f7588203e880a0aba3ac5e0ca6b24f5a259ee8f242376e4431e7ad18fff676240cd1da4b69c26c88027edc4939b8cb71f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
+                "rlp" : "0xf9026af901fda0b518fab5d6c8b367d44476d2205c8f0e818e4901c7a391f980eccf6b1f0d3042a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036060e2a269c37384fd2a993c2bf1086ab3f78b73051562b8e9384cec22f0186a07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0ba92d09ff81435d0e161939af89cc03e20d9a61fa6ba0afcd2a6007c56313026b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301f7588203e880a070ee335f9e159ac99fcb2fa0d15a4a79a15cdf37aa56ff277b91fc940d3ce598887967c5fc67ebfcbdf867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -422,8 +556,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0541e90277b6d53ec0b6d69b093e16bfdbc841846cb08c62ee7d581554a0ddbc0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x37461a911b67511e647002a2304588bdb449546f47a188615b0419a4e2778031",
-        "network" : "Homestead",
+        "lastblockhash" : "0x89c67077eb2517e9816c6e5b2bd7dbefcab875b3b311f79b967728137111275b",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
@@ -479,10 +613,10 @@
             }
         }
     },
-    "ContractInheritance_d0g0v0_Metropolis" : {
+    "ContractInheritance_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/stSolidityTest/ContractInheritance_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -493,19 +627,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x01fd16",
-                    "hash" : "0x6086e801c40de85b5eedbd243ce87e8104a0f36952c264efe0295493cc446ebc",
-                    "mixHash" : "0xe503b695bc8d4c87126bb2b39a4acc11ef2ce1aefb0ede13b78e8308f2426763",
-                    "nonce" : "0x6ac8dfb3e3d703f8",
+                    "gasUsed" : "0x01f758",
+                    "hash" : "0xcffb18f4605cc7a33474d2c942ffdb0631d32004279d059be47c594fb7c1d9e5",
+                    "mixHash" : "0xde3e4612af11b112e4ad6847876172af7c56538c3d98c00473e8d99c931eb569",
+                    "nonce" : "0x7680faecaf00e997",
                     "number" : "0x01",
                     "parentHash" : "0xb518fab5d6c8b367d44476d2205c8f0e818e4901c7a391f980eccf6b1f0d3042",
-                    "receiptTrie" : "0x1e97fb2666e17a64f7d80fea5cf855e4517049523d7a6a7fbd83298cb961df97",
-                    "stateRoot" : "0xbb79d90c09e48c96cfc9ca284709787cb0ab8d379c6d0bff221c952d518e6a0b",
+                    "receiptTrie" : "0xba92d09ff81435d0e161939af89cc03e20d9a61fa6ba0afcd2a6007c56313026",
+                    "stateRoot" : "0x36060e2a269c37384fd2a993c2bf1086ab3f78b73051562b8e9384cec22f0186",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0b518fab5d6c8b367d44476d2205c8f0e818e4901c7a391f980eccf6b1f0d3042a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb79d90c09e48c96cfc9ca284709787cb0ab8d379c6d0bff221c952d518e6a0ba07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a01e97fb2666e17a64f7d80fea5cf855e4517049523d7a6a7fbd83298cb961df97b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301fd168203e880a0e503b695bc8d4c87126bb2b39a4acc11ef2ce1aefb0ede13b78e8308f2426763886ac8dfb3e3d703f8f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
+                "rlp" : "0xf9026af901fda0b518fab5d6c8b367d44476d2205c8f0e818e4901c7a391f980eccf6b1f0d3042a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036060e2a269c37384fd2a993c2bf1086ab3f78b73051562b8e9384cec22f0186a07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0ba92d09ff81435d0e161939af89cc03e20d9a61fa6ba0afcd2a6007c56313026b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301f7588203e880a0de3e4612af11b112e4ad6847876172af7c56538c3d98c00473e8d99c931eb569887680faecaf00e997f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -542,16 +676,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0541e90277b6d53ec0b6d69b093e16bfdbc841846cb08c62ee7d581554a0ddbc0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6086e801c40de85b5eedbd243ce87e8104a0f36952c264efe0295493cc446ebc",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xcffb18f4605cc7a33474d2c942ffdb0631d32004279d059be47c594fb7c1d9e5",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x7c010000000000000000000000000000000000000000000000000000000060003504633e0bca3b8114610039578063c0406226146100a857005b6100b55b600160008060456101ec8339604560006000f091508173ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f161011957005b6100bf60006100c961003d565b8060005260206000f35b8060005260206000f35b600080547fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff0016919091179081905560ff16919050565b505060005163ffffffff166002141561019d575b5b505090565b505060005163ffffffff1660011415610194575b60456101a7600039604560006000f090508073ffffffffffffffffffffffffffffffffffffffff166381bda09b60206000827c010000000000000000000000000000000000000000000000000000000002600052600460006000866161da5a03f16100ff57005b60009250610114565b600092506101145600603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60026000818152602090f3603980600c6000396000f3007c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60016000818152602090f3",
@@ -561,14 +688,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5fd16",
+                "balance" : "0x4563918244f5f758",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x02f8f36a",
+                "balance" : "0x02f8f928",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -577,14 +704,14 @@
             "0xb88de88b35ecbf3c141e3caae2baf35834d18f63" : {
                 "balance" : "0x00",
                 "code" : "0x7c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60026000818152602090f3",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x00",
                 "code" : "0x7c0100000000000000000000000000000000000000000000000000000000600035046381bda09b8114602d57005b60016000818152602090f3",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
diff --git a/BlockchainTests/GeneralStateTests/stSolidityTest/CreateContractFromMethod_d0g0v0.json b/BlockchainTests/GeneralStateTests/stSolidityTest/CreateContractFromMethod_d0g0v0.json
index 3860380e3..92f7f9d77 100644
--- a/BlockchainTests/GeneralStateTests/stSolidityTest/CreateContractFromMethod_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stSolidityTest/CreateContractFromMethod_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "CreateContractFromMethod_d0g0v0_EIP150" : {
+    "CreateContractFromMethod_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/CreateContractFromMethod_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x0112aa",
-                    "hash" : "0xb81eae76c5dd084d73411fe4edd7aa36d9c6c04bad288f72918cfe636f4c167f",
-                    "mixHash" : "0x86137a73dda48483379d72b4b4ee893785e7f17a9332c98b31647f62d0726dba",
-                    "nonce" : "0x6831a9b0eee3a456",
+                    "gasUsed" : "0x0112d2",
+                    "hash" : "0xd1f1a7c627717b703a7f074e83b52fbe06ab7d2fa22848360df69cbf1c971a82",
+                    "mixHash" : "0x2306de14f77a1a11a958d5a3d93fa94a6cf5212085f75b488260d404c2668d5a",
+                    "nonce" : "0x4194d9e933ace0f6",
                     "number" : "0x01",
                     "parentHash" : "0x594ad1a0995434eeab314ba7e1751551b99e8eee68d52cf9d00add296839794f",
-                    "receiptTrie" : "0x08e690d49a37dabd5caaa5dd9ea2318326e8fb26df4a232270ec5f6099857a67",
-                    "stateRoot" : "0x2e7de47c813d90e358f7854b916892cffb377c610a8a6a5bdb4af7d9872d4759",
+                    "receiptTrie" : "0x679717c7d3e33c933033beab80958dbc8619eab2b49c120427ade5bdc90f2f0e",
+                    "stateRoot" : "0x12093a26ed3066a189d74670da2b21c4a5e36bc84ebd47e729b124b729acfec8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f9a0594ad1a0995434eeab314ba7e1751551b99e8eee68d52cf9d00add296839794fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e7de47c813d90e358f7854b916892cffb377c610a8a6a5bdb4af7d9872d4759a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a008e690d49a37dabd5caaa5dd9ea2318326e8fb26df4a232270ec5f6099857a67b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830112aa8203e880a086137a73dda48483379d72b4b4ee893785e7f17a9332c98b31647f62d0726dba886831a9b0eee3a456f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "rlp" : "0xf90265f901f9a0594ad1a0995434eeab314ba7e1751551b99e8eee68d52cf9d00add296839794fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012093a26ed3066a189d74670da2b21c4a5e36bc84ebd47e729b124b729acfec8a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0679717c7d3e33c933033beab80958dbc8619eab2b49c120427ade5bdc90f2f0eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830112d28203e880a02306de14f77a1a11a958d5a3d93fa94a6cf5212085f75b488260d404c2668d5a884194d9e933ace0f6f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028d905258ca559e54e4a96a7f8b49cf4cb8fb9bc8158d766b80dd63d2cbcd330a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb81eae76c5dd084d73411fe4edd7aa36d9c6c04bad288f72918cfe636f4c167f",
-        "network" : "EIP150",
+        "lastblockhash" : "0xd1f1a7c627717b703a7f074e83b52fbe06ab7d2fa22848360df69cbf1c971a82",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
                 "code" : "0x60003560e060020a900480637ee17e1214601f578063c040622614602b57005b60256047565b60006000f35b6031603b565b8060005260206000f35b600060436047565b5090565b60006060605d600039606060006000f09050905600605480600c6000396000f30060003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
@@ -73,14 +80,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f512aa",
+                "balance" : "0x4563918244f512d2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0e2f95",
+                "balance" : "0x0e2f6d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -89,7 +96,7 @@
             "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x00",
                 "code" : "0x60003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             }
@@ -111,10 +118,10 @@
             }
         }
     },
-    "CreateContractFromMethod_d0g0v0_EIP158" : {
+    "CreateContractFromMethod_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/stSolidityTest/CreateContractFromMethod_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -126,18 +133,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0112d2",
-                    "hash" : "0x41abfc2b61d5179c27fb389e63854f036de89861857bb8f5de182badcdd166da",
-                    "mixHash" : "0xf01ffec215272f657dc1814079e091c94505ade09d575e715ed470fca1dc8fed",
-                    "nonce" : "0xaad2de62d41743af",
+                    "hash" : "0xbee5571944dd6116891eccde9ed3c7ba23e596baec98cedb8999763bda5c4ac0",
+                    "mixHash" : "0x3a20b532d7b2be78b088062da03418761070198e26a89997def856969755a533",
+                    "nonce" : "0x26c472c0b9260235",
                     "number" : "0x01",
                     "parentHash" : "0x594ad1a0995434eeab314ba7e1751551b99e8eee68d52cf9d00add296839794f",
-                    "receiptTrie" : "0xc90fae46495538620349fa94b226216f175b7ecbeb6abc72383934183d6613ab",
-                    "stateRoot" : "0xebc24ca39d88f0790a53e7e58a7953ef982dbdc4970977cc6edf7e4812995c12",
+                    "receiptTrie" : "0x679717c7d3e33c933033beab80958dbc8619eab2b49c120427ade5bdc90f2f0e",
+                    "stateRoot" : "0x12093a26ed3066a189d74670da2b21c4a5e36bc84ebd47e729b124b729acfec8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f9a0594ad1a0995434eeab314ba7e1751551b99e8eee68d52cf9d00add296839794fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ebc24ca39d88f0790a53e7e58a7953ef982dbdc4970977cc6edf7e4812995c12a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0c90fae46495538620349fa94b226216f175b7ecbeb6abc72383934183d6613abb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830112d28203e880a0f01ffec215272f657dc1814079e091c94505ade09d575e715ed470fca1dc8fed88aad2de62d41743aff866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "rlp" : "0xf90265f901f9a0594ad1a0995434eeab314ba7e1751551b99e8eee68d52cf9d00add296839794fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012093a26ed3066a189d74670da2b21c4a5e36bc84ebd47e729b124b729acfec8a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0679717c7d3e33c933033beab80958dbc8619eab2b49c120427ade5bdc90f2f0eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830112d28203e880a03a20b532d7b2be78b088062da03418761070198e26a89997def856969755a5338826c472c0b9260235f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -174,9 +181,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028d905258ca559e54e4a96a7f8b49cf4cb8fb9bc8158d766b80dd63d2cbcd330a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x41abfc2b61d5179c27fb389e63854f036de89861857bb8f5de182badcdd166da",
-        "network" : "EIP158",
+        "lastblockhash" : "0xbee5571944dd6116891eccde9ed3c7ba23e596baec98cedb8999763bda5c4ac0",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
                 "code" : "0x60003560e060020a900480637ee17e1214601f578063c040622614602b57005b60256047565b60006000f35b6031603b565b8060005260206000f35b600060436047565b5090565b60006060605d600039606060006000f09050905600605480600c6000396000f30060003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
@@ -223,10 +237,10 @@
             }
         }
     },
-    "CreateContractFromMethod_d0g0v0_Frontier" : {
+    "CreateContractFromMethod_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/CreateContractFromMethod_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -238,9 +252,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0112aa",
-                    "hash" : "0xcaf717caa7f675962308de4c025c6f047f4a1f48bde44a7d12bc85ad1db28eb9",
-                    "mixHash" : "0xce17bfba8fe48c2e578946d9448bfb3194ec30718096c81ed194d5d4133607e7",
-                    "nonce" : "0xa8731a61e75e4a21",
+                    "hash" : "0x3a20de4bfe04c7e45347527524e6ae307a0395d5fa7f51284c6fdae3c603ad12",
+                    "mixHash" : "0xba69b8976566d1fd57fe6006a7cd862935d58c5ce145cc515e3763ed31c52115",
+                    "nonce" : "0x6238d11cf6c60896",
                     "number" : "0x01",
                     "parentHash" : "0x594ad1a0995434eeab314ba7e1751551b99e8eee68d52cf9d00add296839794f",
                     "receiptTrie" : "0x08e690d49a37dabd5caaa5dd9ea2318326e8fb26df4a232270ec5f6099857a67",
@@ -249,7 +263,7 @@
                     "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f9a0594ad1a0995434eeab314ba7e1751551b99e8eee68d52cf9d00add296839794fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e7de47c813d90e358f7854b916892cffb377c610a8a6a5bdb4af7d9872d4759a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a008e690d49a37dabd5caaa5dd9ea2318326e8fb26df4a232270ec5f6099857a67b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830112aa8203e880a0ce17bfba8fe48c2e578946d9448bfb3194ec30718096c81ed194d5d4133607e788a8731a61e75e4a21f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "rlp" : "0xf90265f901f9a0594ad1a0995434eeab314ba7e1751551b99e8eee68d52cf9d00add296839794fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e7de47c813d90e358f7854b916892cffb377c610a8a6a5bdb4af7d9872d4759a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a008e690d49a37dabd5caaa5dd9ea2318326e8fb26df4a232270ec5f6099857a67b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830112aa8203e880a0ba69b8976566d1fd57fe6006a7cd862935d58c5ce145cc515e3763ed31c52115886238d11cf6c60896f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -286,8 +300,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028d905258ca559e54e4a96a7f8b49cf4cb8fb9bc8158d766b80dd63d2cbcd330a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcaf717caa7f675962308de4c025c6f047f4a1f48bde44a7d12bc85ad1db28eb9",
-        "network" : "Frontier",
+        "lastblockhash" : "0x3a20de4bfe04c7e45347527524e6ae307a0395d5fa7f51284c6fdae3c603ad12",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
@@ -335,10 +349,122 @@
             }
         }
     },
-    "CreateContractFromMethod_d0g0v0_Homestead" : {
+    "CreateContractFromMethod_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/CreateContractFromMethod_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x0112d2",
+                    "hash" : "0x786ebf3ce965fa78f0be5a3d9a803420ddfe650fae21193dbd4a5bba03e2701d",
+                    "mixHash" : "0xd3a5c3d4aadea5523b29d48bb4f764ed5b1643afb79c7d47a03d9f9c8b17d7df",
+                    "nonce" : "0xdba47e784cd4421a",
+                    "number" : "0x01",
+                    "parentHash" : "0x594ad1a0995434eeab314ba7e1751551b99e8eee68d52cf9d00add296839794f",
+                    "receiptTrie" : "0xc90fae46495538620349fa94b226216f175b7ecbeb6abc72383934183d6613ab",
+                    "stateRoot" : "0xebc24ca39d88f0790a53e7e58a7953ef982dbdc4970977cc6edf7e4812995c12",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90265f901f9a0594ad1a0995434eeab314ba7e1751551b99e8eee68d52cf9d00add296839794fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ebc24ca39d88f0790a53e7e58a7953ef982dbdc4970977cc6edf7e4812995c12a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0c90fae46495538620349fa94b226216f175b7ecbeb6abc72383934183d6613abb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830112d28203e880a0d3a5c3d4aadea5523b29d48bb4f764ed5b1643afb79c7d47a03d9f9c8b17d7df88dba47e784cd4421af866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x055730",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xde52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5e",
+                        "s" : "0x76154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7f",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x594ad1a0995434eeab314ba7e1751551b99e8eee68d52cf9d00add296839794f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x28d905258ca559e54e4a96a7f8b49cf4cb8fb9bc8158d766b80dd63d2cbcd330",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028d905258ca559e54e4a96a7f8b49cf4cb8fb9bc8158d766b80dd63d2cbcd330a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x786ebf3ce965fa78f0be5a3d9a803420ddfe650fae21193dbd4a5bba03e2701d",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a1",
+                "code" : "0x60003560e060020a900480637ee17e1214601f578063c040622614602b57005b60256047565b60006000f35b6031603b565b8060005260206000f35b600060436047565b5090565b60006060605d600039606060006000f09050905600605480600c6000396000f30060003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f512d2",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0e2f6d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
+                "balance" : "0x00",
+                "code" : "0x60003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x60003560e060020a900480637ee17e1214601f578063c040622614602b57005b60256047565b60006000f35b6031603b565b8060005260206000f35b600060436047565b5090565b60006060605d600039606060006000f09050905600605480600c6000396000f30060003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "CreateContractFromMethod_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/CreateContractFromMethod_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -350,9 +476,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0112aa",
-                    "hash" : "0x4e5c836dd2b03b586cb7504139366bbda75fa4e4641c057688df2ecc607cd420",
-                    "mixHash" : "0x0c2abb32a1e342aede634584e9b3bf3fba0105d8176be6a653375b03fbe58888",
-                    "nonce" : "0xe5875f6a75eab0d5",
+                    "hash" : "0x342ad154d8e6fcd64078d6b6ad7261d1fe430470c1f25c1ca36a8eb735a5f582",
+                    "mixHash" : "0xfe51fc5f011562bd9a274f5cafbb83da538d877c54e76c5d8e06d22e32d7de3b",
+                    "nonce" : "0x496301133dcb907f",
                     "number" : "0x01",
                     "parentHash" : "0x594ad1a0995434eeab314ba7e1751551b99e8eee68d52cf9d00add296839794f",
                     "receiptTrie" : "0x08e690d49a37dabd5caaa5dd9ea2318326e8fb26df4a232270ec5f6099857a67",
@@ -361,7 +487,7 @@
                     "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f9a0594ad1a0995434eeab314ba7e1751551b99e8eee68d52cf9d00add296839794fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e7de47c813d90e358f7854b916892cffb377c610a8a6a5bdb4af7d9872d4759a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a008e690d49a37dabd5caaa5dd9ea2318326e8fb26df4a232270ec5f6099857a67b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830112aa8203e880a00c2abb32a1e342aede634584e9b3bf3fba0105d8176be6a653375b03fbe5888888e5875f6a75eab0d5f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "rlp" : "0xf90265f901f9a0594ad1a0995434eeab314ba7e1751551b99e8eee68d52cf9d00add296839794fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e7de47c813d90e358f7854b916892cffb377c610a8a6a5bdb4af7d9872d4759a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a008e690d49a37dabd5caaa5dd9ea2318326e8fb26df4a232270ec5f6099857a67b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830112aa8203e880a0fe51fc5f011562bd9a274f5cafbb83da538d877c54e76c5d8e06d22e32d7de3b88496301133dcb907ff866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -398,8 +524,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028d905258ca559e54e4a96a7f8b49cf4cb8fb9bc8158d766b80dd63d2cbcd330a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4e5c836dd2b03b586cb7504139366bbda75fa4e4641c057688df2ecc607cd420",
-        "network" : "Homestead",
+        "lastblockhash" : "0x342ad154d8e6fcd64078d6b6ad7261d1fe430470c1f25c1ca36a8eb735a5f582",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
@@ -447,10 +573,10 @@
             }
         }
     },
-    "CreateContractFromMethod_d0g0v0_Metropolis" : {
+    "CreateContractFromMethod_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/stSolidityTest/CreateContractFromMethod_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -461,19 +587,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x0112d2",
-                    "hash" : "0x3b8d589c5f63adf1888293ccc29d3af564abe5ea4407affea62dfe706cb4cbbd",
-                    "mixHash" : "0x0104dda6c99e9dc1ba6c19e179e4ee4c113dce865d1a3b159008b77b1082a06b",
-                    "nonce" : "0x9f6117277fc0f02a",
+                    "gasUsed" : "0x0112aa",
+                    "hash" : "0x54aeef354be78bbc17684d7606c91f367c1f7d43e64d45f2a8720feb087b2956",
+                    "mixHash" : "0x0c86053543526d0ae432a47964a332a64721b1abbcb8e6def77cbc5b1b6e95a0",
+                    "nonce" : "0xdddced760a6c2081",
                     "number" : "0x01",
                     "parentHash" : "0x594ad1a0995434eeab314ba7e1751551b99e8eee68d52cf9d00add296839794f",
-                    "receiptTrie" : "0x679717c7d3e33c933033beab80958dbc8619eab2b49c120427ade5bdc90f2f0e",
-                    "stateRoot" : "0x12093a26ed3066a189d74670da2b21c4a5e36bc84ebd47e729b124b729acfec8",
+                    "receiptTrie" : "0x08e690d49a37dabd5caaa5dd9ea2318326e8fb26df4a232270ec5f6099857a67",
+                    "stateRoot" : "0x2e7de47c813d90e358f7854b916892cffb377c610a8a6a5bdb4af7d9872d4759",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f9a0594ad1a0995434eeab314ba7e1751551b99e8eee68d52cf9d00add296839794fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012093a26ed3066a189d74670da2b21c4a5e36bc84ebd47e729b124b729acfec8a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0679717c7d3e33c933033beab80958dbc8619eab2b49c120427ade5bdc90f2f0eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830112d28203e880a00104dda6c99e9dc1ba6c19e179e4ee4c113dce865d1a3b159008b77b1082a06b889f6117277fc0f02af866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "rlp" : "0xf90265f901f9a0594ad1a0995434eeab314ba7e1751551b99e8eee68d52cf9d00add296839794fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02e7de47c813d90e358f7854b916892cffb377c610a8a6a5bdb4af7d9872d4759a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a008e690d49a37dabd5caaa5dd9ea2318326e8fb26df4a232270ec5f6099857a67b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830112aa8203e880a00c86053543526d0ae432a47964a332a64721b1abbcb8e6def77cbc5b1b6e95a088dddced760a6c2081f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -510,16 +636,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028d905258ca559e54e4a96a7f8b49cf4cb8fb9bc8158d766b80dd63d2cbcd330a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3b8d589c5f63adf1888293ccc29d3af564abe5ea4407affea62dfe706cb4cbbd",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x54aeef354be78bbc17684d7606c91f367c1f7d43e64d45f2a8720feb087b2956",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
                 "code" : "0x60003560e060020a900480637ee17e1214601f578063c040622614602b57005b60256047565b60006000f35b6031603b565b8060005260206000f35b600060436047565b5090565b60006060605d600039606060006000f09050905600605480600c6000396000f30060003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
@@ -528,14 +647,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f512d2",
+                "balance" : "0x4563918244f512aa",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0e2f6d",
+                "balance" : "0x0e2f95",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -544,7 +663,7 @@
             "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x00",
                 "code" : "0x60003560e060020a90048062f55d9d14601e578063b9c3d0a514602d57005b60276004356046565b60006000f35b6033603d565b8060005260206000f35b600060e1905090565b80600160a060020a0316ff5056",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
diff --git a/BlockchainTests/GeneralStateTests/stSolidityTest/RecursiveCreateContractsCreate4Contracts_d0g0v0.json b/BlockchainTests/GeneralStateTests/stSolidityTest/RecursiveCreateContractsCreate4Contracts_d0g0v0.json
index 936f2599b..f8f65f4fb 100644
--- a/BlockchainTests/GeneralStateTests/stSolidityTest/RecursiveCreateContractsCreate4Contracts_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stSolidityTest/RecursiveCreateContractsCreate4Contracts_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RecursiveCreateContractsCreate4Contracts_d0g0v0_EIP150" : {
+    "RecursiveCreateContractsCreate4Contracts_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/RecursiveCreateContractsCreate4Contracts_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x042dd5",
-                    "hash" : "0x453c66d1bbc843a41a54bff0608e9983b59d44135bb8235aaf144e2b43d3c8a9",
-                    "mixHash" : "0xa4626b184a5c23503d758708fc3577f9307f68dce4363220e0d95d275c6ab925",
-                    "nonce" : "0x8c86de953c52e55f",
+                    "gasUsed" : "0x042fdd",
+                    "hash" : "0x088bff9df572e558e4b266b6e09543ee09556b25ab22355da706cc219a4c3d2f",
+                    "mixHash" : "0x1257103bc8efebb4e3b9705696c1341e345bc95ac0cfc7ee44d0ee34ef29c5ce",
+                    "nonce" : "0xfceec68260d7ec50",
                     "number" : "0x01",
                     "parentHash" : "0xccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6",
-                    "receiptTrie" : "0xda3494ed3ec3e03b49f91518b78e9d0a813cce26a4266e2c1fc77b247fb3f95e",
-                    "stateRoot" : "0xd1a9680e1d46c26bb57e1523fb3ef3b5147a63200c0c8faa49f7c9d5185aeeb2",
+                    "receiptTrie" : "0xf4e3d98db17d345df75039b6a93ae60f29d0ca96ba6de4cc305f82995832f424",
+                    "stateRoot" : "0x514c5a76da210ec94ea19f67eed317b6940d16a6b31b4c98ccf3a2ce32303cb0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x39ad9d99163f4e19a1756a274801a9834a317fb986d2f59dc742e00767219124",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90285f901f9a0ccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d1a9680e1d46c26bb57e1523fb3ef3b5147a63200c0c8faa49f7c9d5185aeeb2a039ad9d99163f4e19a1756a274801a9834a317fb986d2f59dc742e00767219124a0da3494ed3ec3e03b49f91518b78e9d0a813cce26a4266e2c1fc77b247fb3f95eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083042dd58203e880a0a4626b184a5c23503d758708fc3577f9307f68dce4363220e0d95d275c6ab925888c86de953c52e55ff886f8848001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8701a4a444f5e900000000000000000000000000000000000000000000000000000000000000041ca031b57750bcec27d287de2911813a872395e21714d4116dd8fbd8f986e3afcb75a06b024ae4d324ac48370d37629381d034e74a32b5ef3f9f74a2b19c92578ecb95c0",
+                "rlp" : "0xf90285f901f9a0ccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0514c5a76da210ec94ea19f67eed317b6940d16a6b31b4c98ccf3a2ce32303cb0a039ad9d99163f4e19a1756a274801a9834a317fb986d2f59dc742e00767219124a0f4e3d98db17d345df75039b6a93ae60f29d0ca96ba6de4cc305f82995832f424b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083042fdd8203e880a01257103bc8efebb4e3b9705696c1341e345bc95ac0cfc7ee44d0ee34ef29c5ce88fceec68260d7ec50f886f8848001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8701a4a444f5e900000000000000000000000000000000000000000000000000000000000000041ca031b57750bcec27d287de2911813a872395e21714d4116dd8fbd8f986e3afcb75a06b024ae4d324ac48370d37629381d034e74a32b5ef3f9f74a2b19c92578ecb95c0",
                 "transactions" : [
                     {
                         "data" : "0xa444f5e90000000000000000000000000000000000000000000000000000000000000004",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0587907fda5c07b4613ce792d46abe052f89f3ce6ea907d38ecace44b0cc3f7bea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x453c66d1bbc843a41a54bff0608e9983b59d44135bb8235aaf144e2b43d3c8a9",
-        "network" : "EIP150",
+        "lastblockhash" : "0x088bff9df572e558e4b266b6e09543ee09556b25ab22355da706cc219a4c3d2f",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x314dc6448d9338c15b09fffffffd",
                 "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000",
@@ -75,21 +82,29 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f82dd5",
+                "balance" : "0x4563918244f82fdd",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0x2b25ae4b13cb6e06869f694d29de45e7614ebd97" : {
+                "balance" : "0x00",
+                "code" : "0x00",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
             "0x5d35480c6e7f8952363fa280a0a96906da981f63" : {
                 "balance" : "0x02",
                 "code" : "0x00",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x481d6a",
+                "balance" : "0x481b62",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -98,23 +113,15 @@
             "0xb88de88b35ecbf3c141e3caae2baf35834d18f63" : {
                 "balance" : "0x02",
                 "code" : "0x00",
-                "nonce" : "0x01",
+                "nonce" : "0x02",
                 "storage" : {
                     "0x00" : "0x02"
                 }
             },
-            "0xc506eeab8810e0b592686a218b889284e45b2c35" : {
-                "balance" : "0x00",
-                "code" : "0x00",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
             "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x00",
                 "code" : "0x00",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x03"
                 }
@@ -137,10 +144,10 @@
             }
         }
     },
-    "RecursiveCreateContractsCreate4Contracts_d0g0v0_EIP158" : {
+    "RecursiveCreateContractsCreate4Contracts_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/stSolidityTest/RecursiveCreateContractsCreate4Contracts_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -152,18 +159,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x042fdd",
-                    "hash" : "0x76ccfaae0c457eeafda2c0a48ac5131d82eb297419581839278ccd9c5f0be0cd",
-                    "mixHash" : "0x3447d35719f4d7082356079251bf5087e556f890d7f6edd94a7753417c451972",
-                    "nonce" : "0x8054ce9556a71817",
+                    "hash" : "0x706548e3bf213dbf12cfc6c5479ed61181d59b0a6848640bfdd0c25725502bd3",
+                    "mixHash" : "0x5f54116c480ecbabc10ae148394005acc2ea17c1ca00dafb8a6aaab0b7e6f19b",
+                    "nonce" : "0x99d48393fb2df3c2",
                     "number" : "0x01",
                     "parentHash" : "0xccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6",
-                    "receiptTrie" : "0x1c4eb32db8a0b41b29be448a617fc79119736ca41a84446bb4443638a8b8547e",
-                    "stateRoot" : "0x4a91535576ea6dcc06b99b570bdb0d5c4cc9b73f4e75385e58c1a2be4ff81a59",
+                    "receiptTrie" : "0xf4e3d98db17d345df75039b6a93ae60f29d0ca96ba6de4cc305f82995832f424",
+                    "stateRoot" : "0x514c5a76da210ec94ea19f67eed317b6940d16a6b31b4c98ccf3a2ce32303cb0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x39ad9d99163f4e19a1756a274801a9834a317fb986d2f59dc742e00767219124",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90285f901f9a0ccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a91535576ea6dcc06b99b570bdb0d5c4cc9b73f4e75385e58c1a2be4ff81a59a039ad9d99163f4e19a1756a274801a9834a317fb986d2f59dc742e00767219124a01c4eb32db8a0b41b29be448a617fc79119736ca41a84446bb4443638a8b8547eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083042fdd8203e880a03447d35719f4d7082356079251bf5087e556f890d7f6edd94a7753417c451972888054ce9556a71817f886f8848001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8701a4a444f5e900000000000000000000000000000000000000000000000000000000000000041ca031b57750bcec27d287de2911813a872395e21714d4116dd8fbd8f986e3afcb75a06b024ae4d324ac48370d37629381d034e74a32b5ef3f9f74a2b19c92578ecb95c0",
+                "rlp" : "0xf90285f901f9a0ccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0514c5a76da210ec94ea19f67eed317b6940d16a6b31b4c98ccf3a2ce32303cb0a039ad9d99163f4e19a1756a274801a9834a317fb986d2f59dc742e00767219124a0f4e3d98db17d345df75039b6a93ae60f29d0ca96ba6de4cc305f82995832f424b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083042fdd8203e880a05f54116c480ecbabc10ae148394005acc2ea17c1ca00dafb8a6aaab0b7e6f19b8899d48393fb2df3c2f886f8848001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8701a4a444f5e900000000000000000000000000000000000000000000000000000000000000041ca031b57750bcec27d287de2911813a872395e21714d4116dd8fbd8f986e3afcb75a06b024ae4d324ac48370d37629381d034e74a32b5ef3f9f74a2b19c92578ecb95c0",
                 "transactions" : [
                     {
                         "data" : "0xa444f5e90000000000000000000000000000000000000000000000000000000000000004",
@@ -200,9 +207,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0587907fda5c07b4613ce792d46abe052f89f3ce6ea907d38ecace44b0cc3f7bea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x76ccfaae0c457eeafda2c0a48ac5131d82eb297419581839278ccd9c5f0be0cd",
-        "network" : "EIP158",
+        "lastblockhash" : "0x706548e3bf213dbf12cfc6c5479ed61181d59b0a6848640bfdd0c25725502bd3",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x314dc6448d9338c15b09fffffffd",
                 "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000",
@@ -275,10 +289,10 @@
             }
         }
     },
-    "RecursiveCreateContractsCreate4Contracts_d0g0v0_Frontier" : {
+    "RecursiveCreateContractsCreate4Contracts_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/RecursiveCreateContractsCreate4Contracts_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -289,19 +303,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x0421c3",
-                    "hash" : "0xf3b459834e60e719b2d783bdce72a9f3013d3e02a608d4696a719cb9fd79a5bc",
-                    "mixHash" : "0x78f6f5224857d82a9e85b7484dc65fafc908d755007211de28f8eadb30591aa6",
-                    "nonce" : "0x2c02ff2e454a401b",
+                    "gasUsed" : "0x042dd5",
+                    "hash" : "0xa38974f7ece374a0b9d3b6ef8b6c3a411b98c6182fa2e1b2c791722c969093f1",
+                    "mixHash" : "0x4b049e6cabce54847a97bd1ddf44f56d9dfdc33ffa3cbcc8bcba784accc57785",
+                    "nonce" : "0x6b5945338e0dd17d",
                     "number" : "0x01",
                     "parentHash" : "0xccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6",
-                    "receiptTrie" : "0xc18e13d5390dfdf4801dfbd80201bfaceccd16f6c45be2da14101315fb8aa691",
-                    "stateRoot" : "0xa835eed6852bcf868cb0afed6869587ed865c3122edabdd4f4cbb317a73eed8f",
+                    "receiptTrie" : "0xda3494ed3ec3e03b49f91518b78e9d0a813cce26a4266e2c1fc77b247fb3f95e",
+                    "stateRoot" : "0xd1a9680e1d46c26bb57e1523fb3ef3b5147a63200c0c8faa49f7c9d5185aeeb2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x39ad9d99163f4e19a1756a274801a9834a317fb986d2f59dc742e00767219124",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90285f901f9a0ccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a835eed6852bcf868cb0afed6869587ed865c3122edabdd4f4cbb317a73eed8fa039ad9d99163f4e19a1756a274801a9834a317fb986d2f59dc742e00767219124a0c18e13d5390dfdf4801dfbd80201bfaceccd16f6c45be2da14101315fb8aa691b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830421c38203e880a078f6f5224857d82a9e85b7484dc65fafc908d755007211de28f8eadb30591aa6882c02ff2e454a401bf886f8848001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8701a4a444f5e900000000000000000000000000000000000000000000000000000000000000041ca031b57750bcec27d287de2911813a872395e21714d4116dd8fbd8f986e3afcb75a06b024ae4d324ac48370d37629381d034e74a32b5ef3f9f74a2b19c92578ecb95c0",
+                "rlp" : "0xf90285f901f9a0ccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d1a9680e1d46c26bb57e1523fb3ef3b5147a63200c0c8faa49f7c9d5185aeeb2a039ad9d99163f4e19a1756a274801a9834a317fb986d2f59dc742e00767219124a0da3494ed3ec3e03b49f91518b78e9d0a813cce26a4266e2c1fc77b247fb3f95eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083042dd58203e880a04b049e6cabce54847a97bd1ddf44f56d9dfdc33ffa3cbcc8bcba784accc57785886b5945338e0dd17df886f8848001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8701a4a444f5e900000000000000000000000000000000000000000000000000000000000000041ca031b57750bcec27d287de2911813a872395e21714d4116dd8fbd8f986e3afcb75a06b024ae4d324ac48370d37629381d034e74a32b5ef3f9f74a2b19c92578ecb95c0",
                 "transactions" : [
                     {
                         "data" : "0xa444f5e90000000000000000000000000000000000000000000000000000000000000004",
@@ -338,8 +352,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0587907fda5c07b4613ce792d46abe052f89f3ce6ea907d38ecace44b0cc3f7bea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf3b459834e60e719b2d783bdce72a9f3013d3e02a608d4696a719cb9fd79a5bc",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa38974f7ece374a0b9d3b6ef8b6c3a411b98c6182fa2e1b2c791722c969093f1",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x314dc6448d9338c15b09fffffffd",
@@ -351,7 +365,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f821c3",
+                "balance" : "0x4563918244f82dd5",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -365,7 +379,7 @@
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x48297c",
+                "balance" : "0x481d6a",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -413,10 +427,148 @@
             }
         }
     },
-    "RecursiveCreateContractsCreate4Contracts_d0g0v0_Homestead" : {
+    "RecursiveCreateContractsCreate4Contracts_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/RecursiveCreateContractsCreate4Contracts_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x042fdd",
+                    "hash" : "0xc4683a09121cdf510289a0acf06f48ed4d7d84b502009ea54286cb19c2808ff9",
+                    "mixHash" : "0x29b0aeac3d811dcd02ad970d3fee8c6c0ec5c93a8e708d27901970696a8112dd",
+                    "nonce" : "0xbf35f43573da1984",
+                    "number" : "0x01",
+                    "parentHash" : "0xccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6",
+                    "receiptTrie" : "0x1c4eb32db8a0b41b29be448a617fc79119736ca41a84446bb4443638a8b8547e",
+                    "stateRoot" : "0x4a91535576ea6dcc06b99b570bdb0d5c4cc9b73f4e75385e58c1a2be4ff81a59",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x39ad9d99163f4e19a1756a274801a9834a317fb986d2f59dc742e00767219124",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90285f901f9a0ccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a91535576ea6dcc06b99b570bdb0d5c4cc9b73f4e75385e58c1a2be4ff81a59a039ad9d99163f4e19a1756a274801a9834a317fb986d2f59dc742e00767219124a01c4eb32db8a0b41b29be448a617fc79119736ca41a84446bb4443638a8b8547eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083042fdd8203e880a029b0aeac3d811dcd02ad970d3fee8c6c0ec5c93a8e708d27901970696a8112dd88bf35f43573da1984f886f8848001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8701a4a444f5e900000000000000000000000000000000000000000000000000000000000000041ca031b57750bcec27d287de2911813a872395e21714d4116dd8fbd8f986e3afcb75a06b024ae4d324ac48370d37629381d034e74a32b5ef3f9f74a2b19c92578ecb95c0",
+                "transactions" : [
+                    {
+                        "data" : "0xa444f5e90000000000000000000000000000000000000000000000000000000000000004",
+                        "gasLimit" : "0x0493e0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x31b57750bcec27d287de2911813a872395e21714d4116dd8fbd8f986e3afcb75",
+                        "s" : "0x6b024ae4d324ac48370d37629381d034e74a32b5ef3f9f74a2b19c92578ecb95",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x587907fda5c07b4613ce792d46abe052f89f3ce6ea907d38ecace44b0cc3f7be",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0587907fda5c07b4613ce792d46abe052f89f3ce6ea907d38ecace44b0cc3f7bea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc4683a09121cdf510289a0acf06f48ed4d7d84b502009ea54286cb19c2808ff9",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x314dc6448d9338c15b09fffffffd",
+                "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000",
+                "nonce" : "0x03",
+                "storage" : {
+                    "0x00" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                    "0x01" : "0x04"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f82fdd",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2b25ae4b13cb6e06869f694d29de45e7614ebd97" : {
+                "balance" : "0x00",
+                "code" : "0x00",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x5d35480c6e7f8952363fa280a0a96906da981f63" : {
+                "balance" : "0x02",
+                "code" : "0x00",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x481b62",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb88de88b35ecbf3c141e3caae2baf35834d18f63" : {
+                "balance" : "0x02",
+                "code" : "0x00",
+                "nonce" : "0x02",
+                "storage" : {
+                    "0x00" : "0x02"
+                }
+            },
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
+                "balance" : "0x00",
+                "code" : "0x00",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x03"
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x314dc6448d9338c15b0a00000000",
+                "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x4c4b40",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RecursiveCreateContractsCreate4Contracts_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/RecursiveCreateContractsCreate4Contracts_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -428,9 +580,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0421c3",
-                    "hash" : "0xba35afc6541aca4b02be9f93ef1d41245809683d2826eebdd7ec11b59301b637",
-                    "mixHash" : "0x3d157c08d5bef71d968890ab4cb9f95f313ae8dea4d7e54a0396c60993e7e679",
-                    "nonce" : "0x6d8be038c8ecd1bc",
+                    "hash" : "0xa5d3d9fe130f618cc687a061f452297af07017ff38e1062f57720d7ff136ecd7",
+                    "mixHash" : "0xea761ae7e2e9c326ffaa10efa231ea18ec1243cbb39474dc2a45dcbfc5206969",
+                    "nonce" : "0x45d7ffc832be76a3",
                     "number" : "0x01",
                     "parentHash" : "0xccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6",
                     "receiptTrie" : "0xc18e13d5390dfdf4801dfbd80201bfaceccd16f6c45be2da14101315fb8aa691",
@@ -439,7 +591,7 @@
                     "transactionsTrie" : "0x39ad9d99163f4e19a1756a274801a9834a317fb986d2f59dc742e00767219124",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90285f901f9a0ccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a835eed6852bcf868cb0afed6869587ed865c3122edabdd4f4cbb317a73eed8fa039ad9d99163f4e19a1756a274801a9834a317fb986d2f59dc742e00767219124a0c18e13d5390dfdf4801dfbd80201bfaceccd16f6c45be2da14101315fb8aa691b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830421c38203e880a03d157c08d5bef71d968890ab4cb9f95f313ae8dea4d7e54a0396c60993e7e679886d8be038c8ecd1bcf886f8848001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8701a4a444f5e900000000000000000000000000000000000000000000000000000000000000041ca031b57750bcec27d287de2911813a872395e21714d4116dd8fbd8f986e3afcb75a06b024ae4d324ac48370d37629381d034e74a32b5ef3f9f74a2b19c92578ecb95c0",
+                "rlp" : "0xf90285f901f9a0ccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a835eed6852bcf868cb0afed6869587ed865c3122edabdd4f4cbb317a73eed8fa039ad9d99163f4e19a1756a274801a9834a317fb986d2f59dc742e00767219124a0c18e13d5390dfdf4801dfbd80201bfaceccd16f6c45be2da14101315fb8aa691b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830421c38203e880a0ea761ae7e2e9c326ffaa10efa231ea18ec1243cbb39474dc2a45dcbfc52069698845d7ffc832be76a3f886f8848001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8701a4a444f5e900000000000000000000000000000000000000000000000000000000000000041ca031b57750bcec27d287de2911813a872395e21714d4116dd8fbd8f986e3afcb75a06b024ae4d324ac48370d37629381d034e74a32b5ef3f9f74a2b19c92578ecb95c0",
                 "transactions" : [
                     {
                         "data" : "0xa444f5e90000000000000000000000000000000000000000000000000000000000000004",
@@ -476,8 +628,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0587907fda5c07b4613ce792d46abe052f89f3ce6ea907d38ecace44b0cc3f7bea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xba35afc6541aca4b02be9f93ef1d41245809683d2826eebdd7ec11b59301b637",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa5d3d9fe130f618cc687a061f452297af07017ff38e1062f57720d7ff136ecd7",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x314dc6448d9338c15b09fffffffd",
@@ -551,10 +703,10 @@
             }
         }
     },
-    "RecursiveCreateContractsCreate4Contracts_d0g0v0_Metropolis" : {
+    "RecursiveCreateContractsCreate4Contracts_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/stSolidityTest/RecursiveCreateContractsCreate4Contracts_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -565,19 +717,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x042fdd",
-                    "hash" : "0x8863dae83626ac3e5d0d59f55ee50ce5a376d9abdf5180444289307595db522b",
-                    "mixHash" : "0xc0fc7c0765b1d78e1d83468bc74d7200187a6a3b32f75679211ad605ff210b90",
-                    "nonce" : "0x7e3bea3e18034e83",
+                    "gasUsed" : "0x0421c3",
+                    "hash" : "0xcc15c67bd7cbf97c55c1e82b0f49e750f72647d3483fb4135e6e1fdf231a4ec9",
+                    "mixHash" : "0x4e5f29d1c114778e63cf634fe14bdba6c14f7d0417fe130b076fe265da992208",
+                    "nonce" : "0xc99ab8617adbd720",
                     "number" : "0x01",
                     "parentHash" : "0xccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6",
-                    "receiptTrie" : "0xf4e3d98db17d345df75039b6a93ae60f29d0ca96ba6de4cc305f82995832f424",
-                    "stateRoot" : "0x514c5a76da210ec94ea19f67eed317b6940d16a6b31b4c98ccf3a2ce32303cb0",
+                    "receiptTrie" : "0xc18e13d5390dfdf4801dfbd80201bfaceccd16f6c45be2da14101315fb8aa691",
+                    "stateRoot" : "0xa835eed6852bcf868cb0afed6869587ed865c3122edabdd4f4cbb317a73eed8f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x39ad9d99163f4e19a1756a274801a9834a317fb986d2f59dc742e00767219124",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90285f901f9a0ccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0514c5a76da210ec94ea19f67eed317b6940d16a6b31b4c98ccf3a2ce32303cb0a039ad9d99163f4e19a1756a274801a9834a317fb986d2f59dc742e00767219124a0f4e3d98db17d345df75039b6a93ae60f29d0ca96ba6de4cc305f82995832f424b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083042fdd8203e880a0c0fc7c0765b1d78e1d83468bc74d7200187a6a3b32f75679211ad605ff210b90887e3bea3e18034e83f886f8848001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8701a4a444f5e900000000000000000000000000000000000000000000000000000000000000041ca031b57750bcec27d287de2911813a872395e21714d4116dd8fbd8f986e3afcb75a06b024ae4d324ac48370d37629381d034e74a32b5ef3f9f74a2b19c92578ecb95c0",
+                "rlp" : "0xf90285f901f9a0ccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a835eed6852bcf868cb0afed6869587ed865c3122edabdd4f4cbb317a73eed8fa039ad9d99163f4e19a1756a274801a9834a317fb986d2f59dc742e00767219124a0c18e13d5390dfdf4801dfbd80201bfaceccd16f6c45be2da14101315fb8aa691b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830421c38203e880a04e5f29d1c114778e63cf634fe14bdba6c14f7d0417fe130b076fe265da99220888c99ab8617adbd720f886f8848001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8701a4a444f5e900000000000000000000000000000000000000000000000000000000000000041ca031b57750bcec27d287de2911813a872395e21714d4116dd8fbd8f986e3afcb75a06b024ae4d324ac48370d37629381d034e74a32b5ef3f9f74a2b19c92578ecb95c0",
                 "transactions" : [
                     {
                         "data" : "0xa444f5e90000000000000000000000000000000000000000000000000000000000000004",
@@ -614,16 +766,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0587907fda5c07b4613ce792d46abe052f89f3ce6ea907d38ecace44b0cc3f7bea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8863dae83626ac3e5d0d59f55ee50ce5a376d9abdf5180444289307595db522b",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xcc15c67bd7cbf97c55c1e82b0f49e750f72647d3483fb4135e6e1fdf231a4ec9",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x314dc6448d9338c15b09fffffffd",
                 "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000",
@@ -634,29 +779,21 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f82fdd",
+                "balance" : "0x4563918244f821c3",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "0x2b25ae4b13cb6e06869f694d29de45e7614ebd97" : {
-                "balance" : "0x00",
-                "code" : "0x00",
-                "nonce" : "0x01",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
             "0x5d35480c6e7f8952363fa280a0a96906da981f63" : {
                 "balance" : "0x02",
                 "code" : "0x00",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x481b62",
+                "balance" : "0x48297c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -665,15 +802,23 @@
             "0xb88de88b35ecbf3c141e3caae2baf35834d18f63" : {
                 "balance" : "0x02",
                 "code" : "0x00",
-                "nonce" : "0x02",
+                "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x02"
                 }
             },
+            "0xc506eeab8810e0b592686a218b889284e45b2c35" : {
+                "balance" : "0x00",
+                "code" : "0x00",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
             "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x00",
                 "code" : "0x00",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                     "0x00" : "0x03"
                 }
diff --git a/BlockchainTests/GeneralStateTests/stSolidityTest/RecursiveCreateContracts_d0g0v0.json b/BlockchainTests/GeneralStateTests/stSolidityTest/RecursiveCreateContracts_d0g0v0.json
index 6054a5d1b..2c10a5da2 100644
--- a/BlockchainTests/GeneralStateTests/stSolidityTest/RecursiveCreateContracts_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stSolidityTest/RecursiveCreateContracts_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "RecursiveCreateContracts_d0g0v0_EIP150" : {
+    "RecursiveCreateContracts_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/RecursiveCreateContracts_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x047c58",
-                    "hash" : "0x520f54d6917d6271ace82a92e21bfa3e5fef66cad468742db58aa3161b9d4164",
-                    "mixHash" : "0xdf697c1ac055caf544f1367148336180b50b46d679ee46255f703d0a5e614dce",
-                    "nonce" : "0xe0dda06b0a44581a",
+                    "gasUsed" : "0x047c5d",
+                    "hash" : "0x2e92200330b3ff6607fb741ad54bac7f4e5d2f2f94ccc5593fcdbe3ab3470422",
+                    "mixHash" : "0x2b0baed09301dba60c95eb9f3f70d7fc032776d347a5e224f45dc221bbbfa500",
+                    "nonce" : "0x5905d3f2fef92649",
                     "number" : "0x01",
                     "parentHash" : "0xccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6",
-                    "receiptTrie" : "0xae8819315a0408deb1c81e76744654aebf07d1b9daf1504cc1f00ae7de791d23",
-                    "stateRoot" : "0xce41f4a53001e23a0968edd0d03e611516c27cac7d2ed65d98c1a3efd7034f60",
+                    "receiptTrie" : "0xf2c8115798f5d115b9252d5c14089cdec50bb67bbb84b200079267fa21c8b344",
+                    "stateRoot" : "0x3c3bb4fc1e5120ffdb295d7762da210456d7d9713656b2738d1c26af86a8038c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x09168f568223560a36885a1da8aa603fe6cab871b8c1dba31eadaece7b9a9418",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90285f901f9a0ccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ce41f4a53001e23a0968edd0d03e611516c27cac7d2ed65d98c1a3efd7034f60a009168f568223560a36885a1da8aa603fe6cab871b8c1dba31eadaece7b9a9418a0ae8819315a0408deb1c81e76744654aebf07d1b9daf1504cc1f00ae7de791d23b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083047c588203e880a0df697c1ac055caf544f1367148336180b50b46d679ee46255f703d0a5e614dce88e0dda06b0a44581af886f8848001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8701a4a444f5e900000000000000000000000000000000000000000000000000000000000003041ba0cc395a2eb3f6629fc35549372a9d25b6e0f9eda0b60387f5a0363d7640c53959a00dbc94a096632bf57ebd82fe0c0c40f10b66aa043ab8cc2de8d057afb78311efc0",
+                "rlp" : "0xf90285f901f9a0ccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c3bb4fc1e5120ffdb295d7762da210456d7d9713656b2738d1c26af86a8038ca009168f568223560a36885a1da8aa603fe6cab871b8c1dba31eadaece7b9a9418a0f2c8115798f5d115b9252d5c14089cdec50bb67bbb84b200079267fa21c8b344b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083047c5d8203e880a02b0baed09301dba60c95eb9f3f70d7fc032776d347a5e224f45dc221bbbfa500885905d3f2fef92649f886f8848001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8701a4a444f5e900000000000000000000000000000000000000000000000000000000000003041ba0cc395a2eb3f6629fc35549372a9d25b6e0f9eda0b60387f5a0363d7640c53959a00dbc94a096632bf57ebd82fe0c0c40f10b66aa043ab8cc2de8d057afb78311efc0",
                 "transactions" : [
                     {
                         "data" : "0xa444f5e90000000000000000000000000000000000000000000000000000000000000304",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0587907fda5c07b4613ce792d46abe052f89f3ce6ea907d38ecace44b0cc3f7bea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x520f54d6917d6271ace82a92e21bfa3e5fef66cad468742db58aa3161b9d4164",
-        "network" : "EIP150",
+        "lastblockhash" : "0x2e92200330b3ff6607fb741ad54bac7f4e5d2f2f94ccc5593fcdbe3ab3470422",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x314dc6448d9338c15b0a00000001",
                 "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000",
@@ -75,14 +82,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f87c58",
+                "balance" : "0x4563918244f87c5d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x47cee7",
+                "balance" : "0x47cee2",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -91,7 +98,7 @@
             "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x00",
                 "code" : "",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                     "0x00" : "0x0303"
                 }
@@ -114,10 +121,10 @@
             }
         }
     },
-    "RecursiveCreateContracts_d0g0v0_EIP158" : {
+    "RecursiveCreateContracts_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/stSolidityTest/RecursiveCreateContracts_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -129,18 +136,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x047c5d",
-                    "hash" : "0x6360652395e01a28eff5030675ebe9bc209bf3b49bb25f227260cf15f6e02916",
-                    "mixHash" : "0x99e5b11475d910163483d15bf48073a534010e5eab68ffb9e4eec6560f9d999f",
-                    "nonce" : "0x55ecb420aecf89d7",
+                    "hash" : "0x2c1dab516148f50ed0e067e96b893c0ee427c414371b4280345ebb752092ba90",
+                    "mixHash" : "0x4e7f750db41a0714c7f45bc642d478f3ee37efc6bff5cfb514856bab35671c4b",
+                    "nonce" : "0x390441b458454470",
                     "number" : "0x01",
                     "parentHash" : "0xccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6",
-                    "receiptTrie" : "0x651180a2abcbccd94bc2ca4832e93fe5f345743f7bb5651738604ab3f7f673ec",
-                    "stateRoot" : "0x3546d4876f62e59491dbfc39e8c6b7e4bd701e91fbf70f71ceebb96b59314fd8",
+                    "receiptTrie" : "0xf2c8115798f5d115b9252d5c14089cdec50bb67bbb84b200079267fa21c8b344",
+                    "stateRoot" : "0x3c3bb4fc1e5120ffdb295d7762da210456d7d9713656b2738d1c26af86a8038c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x09168f568223560a36885a1da8aa603fe6cab871b8c1dba31eadaece7b9a9418",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90285f901f9a0ccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03546d4876f62e59491dbfc39e8c6b7e4bd701e91fbf70f71ceebb96b59314fd8a009168f568223560a36885a1da8aa603fe6cab871b8c1dba31eadaece7b9a9418a0651180a2abcbccd94bc2ca4832e93fe5f345743f7bb5651738604ab3f7f673ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083047c5d8203e880a099e5b11475d910163483d15bf48073a534010e5eab68ffb9e4eec6560f9d999f8855ecb420aecf89d7f886f8848001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8701a4a444f5e900000000000000000000000000000000000000000000000000000000000003041ba0cc395a2eb3f6629fc35549372a9d25b6e0f9eda0b60387f5a0363d7640c53959a00dbc94a096632bf57ebd82fe0c0c40f10b66aa043ab8cc2de8d057afb78311efc0",
+                "rlp" : "0xf90285f901f9a0ccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c3bb4fc1e5120ffdb295d7762da210456d7d9713656b2738d1c26af86a8038ca009168f568223560a36885a1da8aa603fe6cab871b8c1dba31eadaece7b9a9418a0f2c8115798f5d115b9252d5c14089cdec50bb67bbb84b200079267fa21c8b344b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083047c5d8203e880a04e7f750db41a0714c7f45bc642d478f3ee37efc6bff5cfb514856bab35671c4b88390441b458454470f886f8848001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8701a4a444f5e900000000000000000000000000000000000000000000000000000000000003041ba0cc395a2eb3f6629fc35549372a9d25b6e0f9eda0b60387f5a0363d7640c53959a00dbc94a096632bf57ebd82fe0c0c40f10b66aa043ab8cc2de8d057afb78311efc0",
                 "transactions" : [
                     {
                         "data" : "0xa444f5e90000000000000000000000000000000000000000000000000000000000000304",
@@ -177,9 +184,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0587907fda5c07b4613ce792d46abe052f89f3ce6ea907d38ecace44b0cc3f7bea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6360652395e01a28eff5030675ebe9bc209bf3b49bb25f227260cf15f6e02916",
-        "network" : "EIP158",
+        "lastblockhash" : "0x2c1dab516148f50ed0e067e96b893c0ee427c414371b4280345ebb752092ba90",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x314dc6448d9338c15b0a00000001",
                 "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000",
@@ -229,10 +243,10 @@
             }
         }
     },
-    "RecursiveCreateContracts_d0g0v0_Frontier" : {
+    "RecursiveCreateContracts_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/RecursiveCreateContracts_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -243,19 +257,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x0493e0",
-                    "hash" : "0xe7f85de7f4f236b7400994b3109fc57eafcfb6e91cac812204afcd3ab37ceb4f",
-                    "mixHash" : "0x5be8135cfeb48881615a562f7fcf3dedd7eae523d0f65887d35995fb0877c762",
-                    "nonce" : "0x1470af191f7ee93c",
+                    "gasUsed" : "0x047c58",
+                    "hash" : "0x3a7dc28664e9de092e9a776828728ddc6551800d68db78b7e820339c9d1dde73",
+                    "mixHash" : "0x5ad6530cb453b26a8ca9b894dccc0dfaf9d4c16560cdaedcee3a71a332c289b3",
+                    "nonce" : "0x6a7a30fe0aee4ca4",
                     "number" : "0x01",
                     "parentHash" : "0xccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6",
-                    "receiptTrie" : "0xc96f46ae5171956c17db844da58e7c0ad25fd0ae9abb83d66f51f85b1eb1face",
-                    "stateRoot" : "0xf9aecc69c36cec40866b0f988875bec11f59343ba2f763fd875be53fa9c470ca",
+                    "receiptTrie" : "0xae8819315a0408deb1c81e76744654aebf07d1b9daf1504cc1f00ae7de791d23",
+                    "stateRoot" : "0xce41f4a53001e23a0968edd0d03e611516c27cac7d2ed65d98c1a3efd7034f60",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x09168f568223560a36885a1da8aa603fe6cab871b8c1dba31eadaece7b9a9418",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90285f901f9a0ccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f9aecc69c36cec40866b0f988875bec11f59343ba2f763fd875be53fa9c470caa009168f568223560a36885a1da8aa603fe6cab871b8c1dba31eadaece7b9a9418a0c96f46ae5171956c17db844da58e7c0ad25fd0ae9abb83d66f51f85b1eb1faceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830493e08203e880a05be8135cfeb48881615a562f7fcf3dedd7eae523d0f65887d35995fb0877c762881470af191f7ee93cf886f8848001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8701a4a444f5e900000000000000000000000000000000000000000000000000000000000003041ba0cc395a2eb3f6629fc35549372a9d25b6e0f9eda0b60387f5a0363d7640c53959a00dbc94a096632bf57ebd82fe0c0c40f10b66aa043ab8cc2de8d057afb78311efc0",
+                "rlp" : "0xf90285f901f9a0ccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ce41f4a53001e23a0968edd0d03e611516c27cac7d2ed65d98c1a3efd7034f60a009168f568223560a36885a1da8aa603fe6cab871b8c1dba31eadaece7b9a9418a0ae8819315a0408deb1c81e76744654aebf07d1b9daf1504cc1f00ae7de791d23b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083047c588203e880a05ad6530cb453b26a8ca9b894dccc0dfaf9d4c16560cdaedcee3a71a332c289b3886a7a30fe0aee4ca4f886f8848001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8701a4a444f5e900000000000000000000000000000000000000000000000000000000000003041ba0cc395a2eb3f6629fc35549372a9d25b6e0f9eda0b60387f5a0363d7640c53959a00dbc94a096632bf57ebd82fe0c0c40f10b66aa043ab8cc2de8d057afb78311efc0",
                 "transactions" : [
                     {
                         "data" : "0xa444f5e90000000000000000000000000000000000000000000000000000000000000304",
@@ -292,28 +306,153 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0587907fda5c07b4613ce792d46abe052f89f3ce6ea907d38ecace44b0cc3f7bea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe7f85de7f4f236b7400994b3109fc57eafcfb6e91cac812204afcd3ab37ceb4f",
-        "network" : "Frontier",
+        "lastblockhash" : "0x3a7dc28664e9de092e9a776828728ddc6551800d68db78b7e820339c9d1dde73",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x314dc6448d9338c15b0a00000001",
+                "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                    "0x01" : "0x0304"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f87c58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x47cee7",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x0303"
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x314dc6448d9338c15b0a00000000",
                 "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x4c4b40",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "RecursiveCreateContracts_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/RecursiveCreateContracts_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x047c5d",
+                    "hash" : "0xa4e61048f1e4bbafccbb11e4c9507e1d537968534d8fcd605b41da292674e9af",
+                    "mixHash" : "0x0d797942b62a187ddecf65d17f849bd60d04fe82c6764d84e8d61eb3c6f74b40",
+                    "nonce" : "0x2f2ce6937447242e",
+                    "number" : "0x01",
+                    "parentHash" : "0xccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6",
+                    "receiptTrie" : "0x651180a2abcbccd94bc2ca4832e93fe5f345743f7bb5651738604ab3f7f673ec",
+                    "stateRoot" : "0x3546d4876f62e59491dbfc39e8c6b7e4bd701e91fbf70f71ceebb96b59314fd8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x09168f568223560a36885a1da8aa603fe6cab871b8c1dba31eadaece7b9a9418",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90285f901f9a0ccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03546d4876f62e59491dbfc39e8c6b7e4bd701e91fbf70f71ceebb96b59314fd8a009168f568223560a36885a1da8aa603fe6cab871b8c1dba31eadaece7b9a9418a0651180a2abcbccd94bc2ca4832e93fe5f345743f7bb5651738604ab3f7f673ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083047c5d8203e880a00d797942b62a187ddecf65d17f849bd60d04fe82c6764d84e8d61eb3c6f74b40882f2ce6937447242ef886f8848001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8701a4a444f5e900000000000000000000000000000000000000000000000000000000000003041ba0cc395a2eb3f6629fc35549372a9d25b6e0f9eda0b60387f5a0363d7640c53959a00dbc94a096632bf57ebd82fe0c0c40f10b66aa043ab8cc2de8d057afb78311efc0",
+                "transactions" : [
+                    {
+                        "data" : "0xa444f5e90000000000000000000000000000000000000000000000000000000000000304",
+                        "gasLimit" : "0x0493e0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xcc395a2eb3f6629fc35549372a9d25b6e0f9eda0b60387f5a0363d7640c53959",
+                        "s" : "0x0dbc94a096632bf57ebd82fe0c0c40f10b66aa043ab8cc2de8d057afb78311ef",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x587907fda5c07b4613ce792d46abe052f89f3ce6ea907d38ecace44b0cc3f7be",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0587907fda5c07b4613ce792d46abe052f89f3ce6ea907d38ecace44b0cc3f7bea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa4e61048f1e4bbafccbb11e4c9507e1d537968534d8fcd605b41da292674e9af",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x314dc6448d9338c15b0a00000001",
+                "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                    "0x01" : "0x0304"
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f893e0",
+                "balance" : "0x4563918244f87c5d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x47b760",
+                "balance" : "0x47cee2",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
+                "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
+                    "0x00" : "0x0303"
                 }
             }
         },
@@ -334,10 +473,10 @@
             }
         }
     },
-    "RecursiveCreateContracts_d0g0v0_Homestead" : {
+    "RecursiveCreateContracts_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/RecursiveCreateContracts_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -349,9 +488,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x0493e0",
-                    "hash" : "0x88cb2b9439f13d310cb51f90eb1aed6c7ce667e93a07a6624bb4aa27482287f2",
-                    "mixHash" : "0x452c5d3ee87449d7cdf370860cd7de8e3d06ee3427afc03ff9c52bd5203ba16b",
-                    "nonce" : "0x5a6126e172e22c61",
+                    "hash" : "0xd132ac185056529f9279c08b66ef6398944d01acad4492948284f755616a3c96",
+                    "mixHash" : "0x381097db8b38d62b72d5c856a5ec5ad12ca489aa3d2cbb286d6c9ca152895d20",
+                    "nonce" : "0x2169e3bdf700bea2",
                     "number" : "0x01",
                     "parentHash" : "0xccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6",
                     "receiptTrie" : "0xc96f46ae5171956c17db844da58e7c0ad25fd0ae9abb83d66f51f85b1eb1face",
@@ -360,7 +499,7 @@
                     "transactionsTrie" : "0x09168f568223560a36885a1da8aa603fe6cab871b8c1dba31eadaece7b9a9418",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90285f901f9a0ccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f9aecc69c36cec40866b0f988875bec11f59343ba2f763fd875be53fa9c470caa009168f568223560a36885a1da8aa603fe6cab871b8c1dba31eadaece7b9a9418a0c96f46ae5171956c17db844da58e7c0ad25fd0ae9abb83d66f51f85b1eb1faceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830493e08203e880a0452c5d3ee87449d7cdf370860cd7de8e3d06ee3427afc03ff9c52bd5203ba16b885a6126e172e22c61f886f8848001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8701a4a444f5e900000000000000000000000000000000000000000000000000000000000003041ba0cc395a2eb3f6629fc35549372a9d25b6e0f9eda0b60387f5a0363d7640c53959a00dbc94a096632bf57ebd82fe0c0c40f10b66aa043ab8cc2de8d057afb78311efc0",
+                "rlp" : "0xf90285f901f9a0ccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f9aecc69c36cec40866b0f988875bec11f59343ba2f763fd875be53fa9c470caa009168f568223560a36885a1da8aa603fe6cab871b8c1dba31eadaece7b9a9418a0c96f46ae5171956c17db844da58e7c0ad25fd0ae9abb83d66f51f85b1eb1faceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830493e08203e880a0381097db8b38d62b72d5c856a5ec5ad12ca489aa3d2cbb286d6c9ca152895d20882169e3bdf700bea2f886f8848001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8701a4a444f5e900000000000000000000000000000000000000000000000000000000000003041ba0cc395a2eb3f6629fc35549372a9d25b6e0f9eda0b60387f5a0363d7640c53959a00dbc94a096632bf57ebd82fe0c0c40f10b66aa043ab8cc2de8d057afb78311efc0",
                 "transactions" : [
                     {
                         "data" : "0xa444f5e90000000000000000000000000000000000000000000000000000000000000304",
@@ -397,8 +536,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0587907fda5c07b4613ce792d46abe052f89f3ce6ea907d38ecace44b0cc3f7bea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x88cb2b9439f13d310cb51f90eb1aed6c7ce667e93a07a6624bb4aa27482287f2",
-        "network" : "Homestead",
+        "lastblockhash" : "0xd132ac185056529f9279c08b66ef6398944d01acad4492948284f755616a3c96",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x314dc6448d9338c15b0a00000000",
@@ -439,10 +578,10 @@
             }
         }
     },
-    "RecursiveCreateContracts_d0g0v0_Metropolis" : {
+    "RecursiveCreateContracts_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/stSolidityTest/RecursiveCreateContracts_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -453,19 +592,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x047c5d",
-                    "hash" : "0xb44d8bb553b90a5ebdadddacef90b72b263a62dbd2ee5aa6553ba14a7415195d",
-                    "mixHash" : "0x9c98256b73798aaf429aa8110faeea351100fa9fc0d728f4527858935821d3af",
-                    "nonce" : "0x541a2491458fc805",
+                    "gasUsed" : "0x0493e0",
+                    "hash" : "0x4b64897563dbd87379fcd40cec1217a710ab876b5fe52e16a0fe0ca5a6266ecf",
+                    "mixHash" : "0x22937af650be4695011ff141120b0e2143ff75e264ed03089003dc78343131e4",
+                    "nonce" : "0x84fdd606a0204f21",
                     "number" : "0x01",
                     "parentHash" : "0xccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6",
-                    "receiptTrie" : "0xf2c8115798f5d115b9252d5c14089cdec50bb67bbb84b200079267fa21c8b344",
-                    "stateRoot" : "0x3c3bb4fc1e5120ffdb295d7762da210456d7d9713656b2738d1c26af86a8038c",
+                    "receiptTrie" : "0xc96f46ae5171956c17db844da58e7c0ad25fd0ae9abb83d66f51f85b1eb1face",
+                    "stateRoot" : "0xf9aecc69c36cec40866b0f988875bec11f59343ba2f763fd875be53fa9c470ca",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x09168f568223560a36885a1da8aa603fe6cab871b8c1dba31eadaece7b9a9418",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90285f901f9a0ccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03c3bb4fc1e5120ffdb295d7762da210456d7d9713656b2738d1c26af86a8038ca009168f568223560a36885a1da8aa603fe6cab871b8c1dba31eadaece7b9a9418a0f2c8115798f5d115b9252d5c14089cdec50bb67bbb84b200079267fa21c8b344b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083047c5d8203e880a09c98256b73798aaf429aa8110faeea351100fa9fc0d728f4527858935821d3af88541a2491458fc805f886f8848001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8701a4a444f5e900000000000000000000000000000000000000000000000000000000000003041ba0cc395a2eb3f6629fc35549372a9d25b6e0f9eda0b60387f5a0363d7640c53959a00dbc94a096632bf57ebd82fe0c0c40f10b66aa043ab8cc2de8d057afb78311efc0",
+                "rlp" : "0xf90285f901f9a0ccd2199fa3818a4d655cc27f744d9264756cb3f65ac5d8ba935c8e2f5d6ba2f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f9aecc69c36cec40866b0f988875bec11f59343ba2f763fd875be53fa9c470caa009168f568223560a36885a1da8aa603fe6cab871b8c1dba31eadaece7b9a9418a0c96f46ae5171956c17db844da58e7c0ad25fd0ae9abb83d66f51f85b1eb1faceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e100830493e08203e880a022937af650be4695011ff141120b0e2143ff75e264ed03089003dc78343131e48884fdd606a0204f21f886f8848001830493e094095e7baea6a6c7c4c2dfeb977efac326af552d8701a4a444f5e900000000000000000000000000000000000000000000000000000000000003041ba0cc395a2eb3f6629fc35549372a9d25b6e0f9eda0b60387f5a0363d7640c53959a00dbc94a096632bf57ebd82fe0c0c40f10b66aa043ab8cc2de8d057afb78311efc0",
                 "transactions" : [
                     {
                         "data" : "0xa444f5e90000000000000000000000000000000000000000000000000000000000000304",
@@ -502,45 +641,28 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0587907fda5c07b4613ce792d46abe052f89f3ce6ea907d38ecace44b0cc3f7bea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb44d8bb553b90a5ebdadddacef90b72b263a62dbd2ee5aa6553ba14a7415195d",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x4b64897563dbd87379fcd40cec1217a710ab876b5fe52e16a0fe0ca5a6266ecf",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x314dc6448d9338c15b0a00000001",
+                "balance" : "0x314dc6448d9338c15b0a00000000",
                 "code" : "0x60003560e060020a90048063820b13f614610021578063a444f5e91461003257005b61002c600435610093565b60006000f35b61003d600435610043565b60006000f35b600073095e7baea6a6c7c4c2dfeb977efac326af552d8760008190555081600181905550606b6101ad600039606b600054600160a060020a0316815260200182815260200160006000f090505050565b600060c86100e560003960c8600054600160a060020a0316815260200182815260200160006000f0905080600160a060020a0316600060026000600060006000848787f16100dd57005b50505050505600604060c860043960045160245160006001820391508160008190555060008211602657604c565b606b605d600039606b83600160a060020a0316815260200182815260200160006000f090505b505050600180605c6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f300006040606b6004396004516024516001810390508060008190555060008111602457605b565b81600160a060020a031663820b13f6600060008260e060020a026000526004858152602001600060008660325a03f1605857005b50505b5050600180606a6000396000f30000",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                    "0x01" : "0x0304"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f87c5d",
+                "balance" : "0x4563918244f893e0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x47cee2",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
-                "balance" : "0x00",
+                "balance" : "0x47b760",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
-                    "0x00" : "0x0303"
                 }
             }
         },
diff --git a/BlockchainTests/GeneralStateTests/stSolidityTest/TestBlockAndTransactionProperties_d0g0v0.json b/BlockchainTests/GeneralStateTests/stSolidityTest/TestBlockAndTransactionProperties_d0g0v0.json
index 0c65e28a4..8c960e47d 100644
--- a/BlockchainTests/GeneralStateTests/stSolidityTest/TestBlockAndTransactionProperties_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stSolidityTest/TestBlockAndTransactionProperties_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "TestBlockAndTransactionProperties_d0g0v0_EIP150" : {
+    "TestBlockAndTransactionProperties_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestBlockAndTransactionProperties_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x69ba",
-                    "hash" : "0xa21fec86ab8e94e54f8c1b5ce8e3b2da8af7fc5add134cfbb0e8adda43a0b704",
-                    "mixHash" : "0x8fcc48a4c7f08bc1c1a2c3ac508541a825b2c273af93b706570c43dff7f15646",
-                    "nonce" : "0x982359cc9dd8724e",
+                    "hash" : "0x4673f09453b2258f3dd16b750ae40422a1ecae22f570259d4039f513654380f3",
+                    "mixHash" : "0xb6cc4c2b2db6a780da17cea583f46e91c6a2c0550e6cac794007d46afd7634b7",
+                    "nonce" : "0xd633d6783fe93aa5",
                     "number" : "0x01",
                     "parentHash" : "0x9da0cb98fc67916c0e2a4072b730988a89f36442a2b09882129ad677feed999c",
-                    "receiptTrie" : "0xf0bdd118a2e1b202d870ad1623c4a3744fc5d6d3a19b56d518bfef1872777f5b",
-                    "stateRoot" : "0x56a3b2bcad4187e4700907245f94944616307f05817f2137ed7c0cb642253c39",
+                    "receiptTrie" : "0x44ec9e50e12cb54f53f365e0fccd0749432d3a8cd806f0654760479996d84970",
+                    "stateRoot" : "0xdfe60f222bbf713d78b673cd8df977e089f165cb33fb5092369eb4968ad2117a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fca09da0cb98fc67916c0e2a4072b730988a89f36442a2b09882129ad677feed999ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa056a3b2bcad4187e4700907245f94944616307f05817f2137ed7c0cb642253c39a0840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4a0f0bdd118a2e1b202d870ad1623c4a3744fc5d6d3a19b56d518bfef1872777f5bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8269ba8203e880a08fcc48a4c7f08bc1c1a2c3ac508541a825b2c273af93b706570c43dff7f1564688982359cc9dd8724ef866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba04b5305634acd08c1bdb367bf5e3f44499a16f4157f62241ad9780b31da94af42a057e2df90dc63621d959c8f2d19d15b70b7722d5fb4825348dd710da861e80dafc0",
+                "rlp" : "0xf90268f901fca09da0cb98fc67916c0e2a4072b730988a89f36442a2b09882129ad677feed999ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dfe60f222bbf713d78b673cd8df977e089f165cb33fb5092369eb4968ad2117aa0840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4a044ec9e50e12cb54f53f365e0fccd0749432d3a8cd806f0654760479996d84970b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8269ba8203e880a0b6cc4c2b2db6a780da17cea583f46e91c6a2c0550e6cac794007d46afd7634b788d633d6783fe93aa5f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba04b5305634acd08c1bdb367bf5e3f44499a16f4157f62241ad9780b31da94af42a057e2df90dc63621d959c8f2d19d15b70b7722d5fb4825348dd710da861e80dafc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006ae9710bf7ce8132ccebd1f1ab051d5d181f60ef075d6fb521c5e8f1e9665c3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa21fec86ab8e94e54f8c1b5ce8e3b2da8af7fc5add134cfbb0e8adda43a0b704",
-        "network" : "EIP150",
+        "lastblockhash" : "0x4673f09453b2258f3dd16b750ae40422a1ecae22f570259d4039f513654380f3",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x018704",
                 "code" : "0x60606040526000357c010000000000000000000000000000000000000000000000000000000090048063c040622614610044578063e97384dc1461006957610042565b005b610051600480505061008e565b60405180821515815260200191505060405180910390f35b61007660048050506100c9565b60405180821515815260200191505060405180910390f35b60006100986100c9565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff1690506100c6565b90565b6000600190508050732adc25665018aa1fe0e6bc666dac8fc2697ff9ba4173ffffffffffffffffffffffffffffffffffffffff1614151561010d57600090506101f7565b6302b8feb04414151561012357600090506101f7565b677fffffffffffffff4514151561013d57600090506101f7565b60784314151561015057600090506101f7565b6078405042505a5073a94f5374fce5edbc8e2a8697c15331677e6ebf0b3373ffffffffffffffffffffffffffffffffffffffff1614151561019457600090506101f7565b6064341415156101a757600090506101f7565b60013a1415156101ba57600090506101f7565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b3273ffffffffffffffffffffffffffffffffffffffff161415156101f657600090506101f7565b5b9056",
@@ -104,10 +111,122 @@
             }
         }
     },
-    "TestBlockAndTransactionProperties_d0g0v0_EIP158" : {
+    "TestBlockAndTransactionProperties_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestBlockAndTransactionProperties_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x69ba",
+                    "hash" : "0x4efc431f645bae260389173495988b901532462aec5e48595db04710106d1a19",
+                    "mixHash" : "0xab6b5701552e92c43b411a0c6dd4b304de5e365b07be3ed8d8796c817a6a4a62",
+                    "nonce" : "0x08bd483325a0e68c",
+                    "number" : "0x01",
+                    "parentHash" : "0x9da0cb98fc67916c0e2a4072b730988a89f36442a2b09882129ad677feed999c",
+                    "receiptTrie" : "0x44ec9e50e12cb54f53f365e0fccd0749432d3a8cd806f0654760479996d84970",
+                    "stateRoot" : "0xdfe60f222bbf713d78b673cd8df977e089f165cb33fb5092369eb4968ad2117a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90268f901fca09da0cb98fc67916c0e2a4072b730988a89f36442a2b09882129ad677feed999ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dfe60f222bbf713d78b673cd8df977e089f165cb33fb5092369eb4968ad2117aa0840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4a044ec9e50e12cb54f53f365e0fccd0749432d3a8cd806f0654760479996d84970b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8269ba8203e880a0ab6b5701552e92c43b411a0c6dd4b304de5e365b07be3ed8d8796c817a6a4a628808bd483325a0e68cf866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba04b5305634acd08c1bdb367bf5e3f44499a16f4157f62241ad9780b31da94af42a057e2df90dc63621d959c8f2d19d15b70b7722d5fb4825348dd710da861e80dafc0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x055730",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4b5305634acd08c1bdb367bf5e3f44499a16f4157f62241ad9780b31da94af42",
+                        "s" : "0x57e2df90dc63621d959c8f2d19d15b70b7722d5fb4825348dd710da861e80daf",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x64"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0x9da0cb98fc67916c0e2a4072b730988a89f36442a2b09882129ad677feed999c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x06ae9710bf7ce8132ccebd1f1ab051d5d181f60ef075d6fb521c5e8f1e9665c3",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006ae9710bf7ce8132ccebd1f1ab051d5d181f60ef075d6fb521c5e8f1e9665c3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4efc431f645bae260389173495988b901532462aec5e48595db04710106d1a19",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x018704",
+                "code" : "0x60606040526000357c010000000000000000000000000000000000000000000000000000000090048063c040622614610044578063e97384dc1461006957610042565b005b610051600480505061008e565b60405180821515815260200191505060405180910390f35b61007660048050506100c9565b60405180821515815260200191505060405180910390f35b60006100986100c9565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff1690506100c6565b90565b6000600190508050732adc25665018aa1fe0e6bc666dac8fc2697ff9ba4173ffffffffffffffffffffffffffffffffffffffff1614151561010d57600090506101f7565b6302b8feb04414151561012357600090506101f7565b677fffffffffffffff4514151561013d57600090506101f7565b60784314151561015057600090506101f7565b6078405042505a5073a94f5374fce5edbc8e2a8697c15331677e6ebf0b3373ffffffffffffffffffffffffffffffffffffffff1614151561019457600090506101f7565b6064341415156101a757600090506101f7565b60013a1415156101ba57600090506101f7565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b3273ffffffffffffffffffffffffffffffffffffffff161415156101f657600090506101f7565b5b9056",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f469ba",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0ed822",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x60606040526000357c010000000000000000000000000000000000000000000000000000000090048063c040622614610044578063e97384dc1461006957610042565b005b610051600480505061008e565b60405180821515815260200191505060405180910390f35b61007660048050506100c9565b60405180821515815260200191505060405180910390f35b60006100986100c9565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff1690506100c6565b90565b6000600190508050732adc25665018aa1fe0e6bc666dac8fc2697ff9ba4173ffffffffffffffffffffffffffffffffffffffff1614151561010d57600090506101f7565b6302b8feb04414151561012357600090506101f7565b677fffffffffffffff4514151561013d57600090506101f7565b60784314151561015057600090506101f7565b6078405042505a5073a94f5374fce5edbc8e2a8697c15331677e6ebf0b3373ffffffffffffffffffffffffffffffffffffffff1614151561019457600090506101f7565b6064341415156101a757600090506101f7565b60013a1415156101ba57600090506101f7565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b3273ffffffffffffffffffffffffffffffffffffffff161415156101f657600090506101f7565b5b9056",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "TestBlockAndTransactionProperties_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestBlockAndTransactionProperties_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,9 +238,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x69ba",
-                    "hash" : "0x1aeedc16fc3978a95779192b6b79df14d37511f4daf775e398b1f2236eaaf97c",
-                    "mixHash" : "0xc52d7701e29b6dff42c001acb8640f5388de3531ac28983ad10da305ad61508c",
-                    "nonce" : "0x9c1f00c81660f437",
+                    "hash" : "0xad62d9bd0fbbeb0e25f3dc735aa689eb08bab5e3f451b6574c0880c0abb30cef",
+                    "mixHash" : "0xa81789771e4dd17c724c25950b260731a65e1ea5042200f9bab102e1998b575e",
+                    "nonce" : "0xa4090ff03b9c3aa3",
                     "number" : "0x01",
                     "parentHash" : "0x9da0cb98fc67916c0e2a4072b730988a89f36442a2b09882129ad677feed999c",
                     "receiptTrie" : "0xf0bdd118a2e1b202d870ad1623c4a3744fc5d6d3a19b56d518bfef1872777f5b",
@@ -130,7 +249,7 @@
                     "transactionsTrie" : "0x840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fca09da0cb98fc67916c0e2a4072b730988a89f36442a2b09882129ad677feed999ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa056a3b2bcad4187e4700907245f94944616307f05817f2137ed7c0cb642253c39a0840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4a0f0bdd118a2e1b202d870ad1623c4a3744fc5d6d3a19b56d518bfef1872777f5bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8269ba8203e880a0c52d7701e29b6dff42c001acb8640f5388de3531ac28983ad10da305ad61508c889c1f00c81660f437f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba04b5305634acd08c1bdb367bf5e3f44499a16f4157f62241ad9780b31da94af42a057e2df90dc63621d959c8f2d19d15b70b7722d5fb4825348dd710da861e80dafc0",
+                "rlp" : "0xf90268f901fca09da0cb98fc67916c0e2a4072b730988a89f36442a2b09882129ad677feed999ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa056a3b2bcad4187e4700907245f94944616307f05817f2137ed7c0cb642253c39a0840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4a0f0bdd118a2e1b202d870ad1623c4a3744fc5d6d3a19b56d518bfef1872777f5bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8269ba8203e880a0a81789771e4dd17c724c25950b260731a65e1ea5042200f9bab102e1998b575e88a4090ff03b9c3aa3f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba04b5305634acd08c1bdb367bf5e3f44499a16f4157f62241ad9780b31da94af42a057e2df90dc63621d959c8f2d19d15b70b7722d5fb4825348dd710da861e80dafc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -167,8 +286,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006ae9710bf7ce8132ccebd1f1ab051d5d181f60ef075d6fb521c5e8f1e9665c3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1aeedc16fc3978a95779192b6b79df14d37511f4daf775e398b1f2236eaaf97c",
-        "network" : "EIP158",
+        "lastblockhash" : "0xad62d9bd0fbbeb0e25f3dc735aa689eb08bab5e3f451b6574c0880c0abb30cef",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x018704",
@@ -209,10 +328,10 @@
             }
         }
     },
-    "TestBlockAndTransactionProperties_d0g0v0_Frontier" : {
+    "TestBlockAndTransactionProperties_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestBlockAndTransactionProperties_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -223,19 +342,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x688e",
-                    "hash" : "0xcdc3bda577f7908eb8fbec9c0309fa5f29ecbc252275e204a00fbdb39a84cc67",
-                    "mixHash" : "0x9fd3e685545dd0661a743b6bf017618d132e399f54577fcf29924d70dfc41a39",
-                    "nonce" : "0x479661d817bb0c84",
+                    "gasUsed" : "0x69ba",
+                    "hash" : "0xd46f6d917325442b97e6d8490c3570954053175663ef29c8de2900b62c194917",
+                    "mixHash" : "0x54e39f39e199fb66de2a175c84758a733d1b5ad3d18e1b3c405979078f4b0b4d",
+                    "nonce" : "0x2d79c49ed05e0d74",
                     "number" : "0x01",
                     "parentHash" : "0x9da0cb98fc67916c0e2a4072b730988a89f36442a2b09882129ad677feed999c",
-                    "receiptTrie" : "0x3a1cec47de717833f8d71d2749dffec0425407c4e877fd241ca76743c296c563",
-                    "stateRoot" : "0x696e070d903ecebc7457fd5792424abebe59b8f0eaf747994a75e16a41d67893",
+                    "receiptTrie" : "0xf0bdd118a2e1b202d870ad1623c4a3744fc5d6d3a19b56d518bfef1872777f5b",
+                    "stateRoot" : "0x56a3b2bcad4187e4700907245f94944616307f05817f2137ed7c0cb642253c39",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fca09da0cb98fc67916c0e2a4072b730988a89f36442a2b09882129ad677feed999ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0696e070d903ecebc7457fd5792424abebe59b8f0eaf747994a75e16a41d67893a0840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4a03a1cec47de717833f8d71d2749dffec0425407c4e877fd241ca76743c296c563b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82688e8203e880a09fd3e685545dd0661a743b6bf017618d132e399f54577fcf29924d70dfc41a3988479661d817bb0c84f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba04b5305634acd08c1bdb367bf5e3f44499a16f4157f62241ad9780b31da94af42a057e2df90dc63621d959c8f2d19d15b70b7722d5fb4825348dd710da861e80dafc0",
+                "rlp" : "0xf90268f901fca09da0cb98fc67916c0e2a4072b730988a89f36442a2b09882129ad677feed999ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa056a3b2bcad4187e4700907245f94944616307f05817f2137ed7c0cb642253c39a0840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4a0f0bdd118a2e1b202d870ad1623c4a3744fc5d6d3a19b56d518bfef1872777f5bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8269ba8203e880a054e39f39e199fb66de2a175c84758a733d1b5ad3d18e1b3c405979078f4b0b4d882d79c49ed05e0d74f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba04b5305634acd08c1bdb367bf5e3f44499a16f4157f62241ad9780b31da94af42a057e2df90dc63621d959c8f2d19d15b70b7722d5fb4825348dd710da861e80dafc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -272,8 +391,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006ae9710bf7ce8132ccebd1f1ab051d5d181f60ef075d6fb521c5e8f1e9665c3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcdc3bda577f7908eb8fbec9c0309fa5f29ecbc252275e204a00fbdb39a84cc67",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd46f6d917325442b97e6d8490c3570954053175663ef29c8de2900b62c194917",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x018704",
@@ -283,14 +402,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4688e",
+                "balance" : "0x4563918244f469ba",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0ed94e",
+                "balance" : "0x0ed822",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -314,10 +433,10 @@
             }
         }
     },
-    "TestBlockAndTransactionProperties_d0g0v0_Homestead" : {
+    "TestBlockAndTransactionProperties_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestBlockAndTransactionProperties_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -329,9 +448,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x688e",
-                    "hash" : "0xf4232b09b1a002fee7878ff23611166f0a044806f12b82a121ffd5a3ebc42e0f",
-                    "mixHash" : "0x1496e379f0afac38eae533f1887f00ac51b08c6a598fab87d6b691a98324bbd5",
-                    "nonce" : "0xc10311d6d4f6666c",
+                    "hash" : "0xc01bea471031d84fd9f981d3bcbdc646c4322ca65fa12bbe0f38d9e5269c850c",
+                    "mixHash" : "0x4f3ec59cd79da560adcb490a70d26b7c8201d9296afd7b4c7adfcb5787483f85",
+                    "nonce" : "0x1acd8e07254c03ad",
                     "number" : "0x01",
                     "parentHash" : "0x9da0cb98fc67916c0e2a4072b730988a89f36442a2b09882129ad677feed999c",
                     "receiptTrie" : "0x3a1cec47de717833f8d71d2749dffec0425407c4e877fd241ca76743c296c563",
@@ -340,7 +459,7 @@
                     "transactionsTrie" : "0x840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fca09da0cb98fc67916c0e2a4072b730988a89f36442a2b09882129ad677feed999ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0696e070d903ecebc7457fd5792424abebe59b8f0eaf747994a75e16a41d67893a0840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4a03a1cec47de717833f8d71d2749dffec0425407c4e877fd241ca76743c296c563b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82688e8203e880a01496e379f0afac38eae533f1887f00ac51b08c6a598fab87d6b691a98324bbd588c10311d6d4f6666cf866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba04b5305634acd08c1bdb367bf5e3f44499a16f4157f62241ad9780b31da94af42a057e2df90dc63621d959c8f2d19d15b70b7722d5fb4825348dd710da861e80dafc0",
+                "rlp" : "0xf90268f901fca09da0cb98fc67916c0e2a4072b730988a89f36442a2b09882129ad677feed999ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0696e070d903ecebc7457fd5792424abebe59b8f0eaf747994a75e16a41d67893a0840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4a03a1cec47de717833f8d71d2749dffec0425407c4e877fd241ca76743c296c563b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82688e8203e880a04f3ec59cd79da560adcb490a70d26b7c8201d9296afd7b4c7adfcb5787483f85881acd8e07254c03adf866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba04b5305634acd08c1bdb367bf5e3f44499a16f4157f62241ad9780b31da94af42a057e2df90dc63621d959c8f2d19d15b70b7722d5fb4825348dd710da861e80dafc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -377,8 +496,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006ae9710bf7ce8132ccebd1f1ab051d5d181f60ef075d6fb521c5e8f1e9665c3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf4232b09b1a002fee7878ff23611166f0a044806f12b82a121ffd5a3ebc42e0f",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc01bea471031d84fd9f981d3bcbdc646c4322ca65fa12bbe0f38d9e5269c850c",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x018704",
@@ -419,10 +538,10 @@
             }
         }
     },
-    "TestBlockAndTransactionProperties_d0g0v0_Metropolis" : {
+    "TestBlockAndTransactionProperties_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/stSolidityTest/TestBlockAndTransactionProperties_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -433,19 +552,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x69ba",
-                    "hash" : "0x9652162b392548b31a9cf7f3fef1eac28fe43b462028c4fc0ccb0d1e80ae8023",
-                    "mixHash" : "0xb10d4a1824a2ab536750142b3ae62397594064e8f0849341c9d9fd9035949cf0",
-                    "nonce" : "0xe523e9c989be0d64",
+                    "gasUsed" : "0x688e",
+                    "hash" : "0x138e56ae2a799d03e3457698b0093fce1b313940855821b1242488479f99b296",
+                    "mixHash" : "0xc061dd2dcf18fa292f63a9603a6530439de291f9995aad6167abbeab2c4e52a8",
+                    "nonce" : "0x585b0e3aa41236f3",
                     "number" : "0x01",
                     "parentHash" : "0x9da0cb98fc67916c0e2a4072b730988a89f36442a2b09882129ad677feed999c",
-                    "receiptTrie" : "0x44ec9e50e12cb54f53f365e0fccd0749432d3a8cd806f0654760479996d84970",
-                    "stateRoot" : "0xdfe60f222bbf713d78b673cd8df977e089f165cb33fb5092369eb4968ad2117a",
+                    "receiptTrie" : "0x3a1cec47de717833f8d71d2749dffec0425407c4e877fd241ca76743c296c563",
+                    "stateRoot" : "0x696e070d903ecebc7457fd5792424abebe59b8f0eaf747994a75e16a41d67893",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fca09da0cb98fc67916c0e2a4072b730988a89f36442a2b09882129ad677feed999ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dfe60f222bbf713d78b673cd8df977e089f165cb33fb5092369eb4968ad2117aa0840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4a044ec9e50e12cb54f53f365e0fccd0749432d3a8cd806f0654760479996d84970b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8269ba8203e880a0b10d4a1824a2ab536750142b3ae62397594064e8f0849341c9d9fd9035949cf088e523e9c989be0d64f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba04b5305634acd08c1bdb367bf5e3f44499a16f4157f62241ad9780b31da94af42a057e2df90dc63621d959c8f2d19d15b70b7722d5fb4825348dd710da861e80dafc0",
+                "rlp" : "0xf90268f901fca09da0cb98fc67916c0e2a4072b730988a89f36442a2b09882129ad677feed999ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0696e070d903ecebc7457fd5792424abebe59b8f0eaf747994a75e16a41d67893a0840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4a03a1cec47de717833f8d71d2749dffec0425407c4e877fd241ca76743c296c563b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82688e8203e880a0c061dd2dcf18fa292f63a9603a6530439de291f9995aad6167abbeab2c4e52a888585b0e3aa41236f3f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba04b5305634acd08c1bdb367bf5e3f44499a16f4157f62241ad9780b31da94af42a057e2df90dc63621d959c8f2d19d15b70b7722d5fb4825348dd710da861e80dafc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -482,16 +601,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006ae9710bf7ce8132ccebd1f1ab051d5d181f60ef075d6fb521c5e8f1e9665c3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9652162b392548b31a9cf7f3fef1eac28fe43b462028c4fc0ccb0d1e80ae8023",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x138e56ae2a799d03e3457698b0093fce1b313940855821b1242488479f99b296",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x018704",
                 "code" : "0x60606040526000357c010000000000000000000000000000000000000000000000000000000090048063c040622614610044578063e97384dc1461006957610042565b005b610051600480505061008e565b60405180821515815260200191505060405180910390f35b61007660048050506100c9565b60405180821515815260200191505060405180910390f35b60006100986100c9565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff1690506100c6565b90565b6000600190508050732adc25665018aa1fe0e6bc666dac8fc2697ff9ba4173ffffffffffffffffffffffffffffffffffffffff1614151561010d57600090506101f7565b6302b8feb04414151561012357600090506101f7565b677fffffffffffffff4514151561013d57600090506101f7565b60784314151561015057600090506101f7565b6078405042505a5073a94f5374fce5edbc8e2a8697c15331677e6ebf0b3373ffffffffffffffffffffffffffffffffffffffff1614151561019457600090506101f7565b6064341415156101a757600090506101f7565b60013a1415156101ba57600090506101f7565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b3273ffffffffffffffffffffffffffffffffffffffff161415156101f657600090506101f7565b5b9056",
@@ -500,14 +612,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f469ba",
+                "balance" : "0x4563918244f4688e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0ed822",
+                "balance" : "0x0ed94e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stSolidityTest/TestContractInteraction_d0g0v0.json b/BlockchainTests/GeneralStateTests/stSolidityTest/TestContractInteraction_d0g0v0.json
index d1a6d6512..8b6b015eb 100644
--- a/BlockchainTests/GeneralStateTests/stSolidityTest/TestContractInteraction_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stSolidityTest/TestContractInteraction_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "TestContractInteraction_d0g0v0_EIP150" : {
+    "TestContractInteraction_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestContractInteraction_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x017fed",
-                    "hash" : "0xd6078dbb245d181ec3a39dcd0685890632b871885451141442f0b703f92a0735",
-                    "mixHash" : "0xd897066d04f32b02a68e0cc8b1c12bc67cb0f836e75b157079d771bf71f00e24",
-                    "nonce" : "0x2b3ff2463b7947e5",
+                    "hash" : "0xed5997ac4bf756594196d79d45425b7f23a9d4fa999a6f425e3f52653a03fae2",
+                    "mixHash" : "0xd7625433620a36ea516d009cc66affe580c3e6cdac19e6117f140a4e1b7482dd",
+                    "nonce" : "0x23ca0d61d6a004c4",
                     "number" : "0x01",
                     "parentHash" : "0x8e10ac293181f686b675698ee6dc83a2562e44b88cea608db92176af237ad948",
-                    "receiptTrie" : "0x7451788bea037f470e94646fd864b61b1d3f6bfc940434d81aa532fe890cf210",
-                    "stateRoot" : "0x9754b8e7df809273cd8c3a7269bc743e0010b2c2386683cb80975d4b6a81ee63",
+                    "receiptTrie" : "0x452fecf46d840243c7420dac6bc11358533286d57463a4d21cdc53611849e27e",
+                    "stateRoot" : "0x1046c6d1986019098ee3114d1bb9e92066a7b5bdc7379bc23e6ccdb94b256229",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f9a08e10ac293181f686b675698ee6dc83a2562e44b88cea608db92176af237ad948a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09754b8e7df809273cd8c3a7269bc743e0010b2c2386683cb80975d4b6a81ee63a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a07451788bea037f470e94646fd864b61b1d3f6bfc940434d81aa532fe890cf210b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083017fed8203e880a0d897066d04f32b02a68e0cc8b1c12bc67cb0f836e75b157079d771bf71f00e24882b3ff2463b7947e5f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "rlp" : "0xf90265f901f9a08e10ac293181f686b675698ee6dc83a2562e44b88cea608db92176af237ad948a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01046c6d1986019098ee3114d1bb9e92066a7b5bdc7379bc23e6ccdb94b256229a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0452fecf46d840243c7420dac6bc11358533286d57463a4d21cdc53611849e27eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083017fed8203e880a0d7625433620a36ea516d009cc66affe580c3e6cdac19e6117f140a4e1b7482dd8823ca0d61d6a004c4f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0462aa8951e81a0eb257d1c935bf7b26bc013a9bf16b00ae054badcc5158b8e62a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd6078dbb245d181ec3a39dcd0685890632b871885451141442f0b703f92a0735",
-        "network" : "EIP150",
+        "lastblockhash" : "0xed5997ac4bf756594196d79d45425b7f23a9d4fa999a6f425e3f52653a03fae2",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114610039578063ed973fe91461004b57005b6100416100ea565b8060005260206000f35b61005361005d565b8060005260206000f35b60006000608161011a600039608160006000f0905073ffffffffffffffffffffffffffffffffffffffff811663b9c3d0a5602060007fb9c3d0a50000000000000000000000000000000000000000000000000000000081526004600060008660325a03f16100c757005b505060005160e1146100d8576100e1565b600191506100e6565b600091505b5090565b60006100f461005d565b600060006101000a81548160ff0219169083021790555060ff600160005404169050905600607580600c6000396000f3007c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f6004356055565b60006000f35b604b6070565b8060005260206000f35b8073ffffffffffffffffffffffffffffffffffffffff16ff50565b60e19056",
@@ -90,7 +97,7 @@
             "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x00",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f6004356055565b60006000f35b604b6070565b8060005260206000f35b8073ffffffffffffffffffffffffffffffffffffffff16ff50565b60e19056",
-                "nonce" : "0x00",
+                "nonce" : "0x01",
                 "storage" : {
                 }
             }
@@ -112,10 +119,10 @@
             }
         }
     },
-    "TestContractInteraction_d0g0v0_EIP158" : {
+    "TestContractInteraction_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/stSolidityTest/TestContractInteraction_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -127,18 +134,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x017fed",
-                    "hash" : "0xe347f1701f36f1c55bd2495f185034863f62c064a3eeb6aaf58e14f6c1ef7037",
-                    "mixHash" : "0xd044ef6683321b69c9c9b5895e6db762826b6f7c85a90edc99416970d58c49d8",
-                    "nonce" : "0xc65bd3273b294d93",
+                    "hash" : "0x7d92515b9d132769de4add0b1174b8f2c7973faed685097bc856d91cac28fe5e",
+                    "mixHash" : "0xe1972c5c2bbc6717fea1f004bae671dcb7be18b0e2a6a97dde3bcbd512dc1c80",
+                    "nonce" : "0x51b5f947041a1a57",
                     "number" : "0x01",
                     "parentHash" : "0x8e10ac293181f686b675698ee6dc83a2562e44b88cea608db92176af237ad948",
-                    "receiptTrie" : "0xea48afaffd1d1e0d9f833729e5bac9d3460837228a55c5513291e76151eee925",
-                    "stateRoot" : "0x6c941e0fbc6f9f989e905dbe2dbf3016a3ed33a18097c82877cea14e94f7138a",
+                    "receiptTrie" : "0x452fecf46d840243c7420dac6bc11358533286d57463a4d21cdc53611849e27e",
+                    "stateRoot" : "0x1046c6d1986019098ee3114d1bb9e92066a7b5bdc7379bc23e6ccdb94b256229",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f9a08e10ac293181f686b675698ee6dc83a2562e44b88cea608db92176af237ad948a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c941e0fbc6f9f989e905dbe2dbf3016a3ed33a18097c82877cea14e94f7138aa0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0ea48afaffd1d1e0d9f833729e5bac9d3460837228a55c5513291e76151eee925b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083017fed8203e880a0d044ef6683321b69c9c9b5895e6db762826b6f7c85a90edc99416970d58c49d888c65bd3273b294d93f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "rlp" : "0xf90265f901f9a08e10ac293181f686b675698ee6dc83a2562e44b88cea608db92176af237ad948a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01046c6d1986019098ee3114d1bb9e92066a7b5bdc7379bc23e6ccdb94b256229a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0452fecf46d840243c7420dac6bc11358533286d57463a4d21cdc53611849e27eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083017fed8203e880a0e1972c5c2bbc6717fea1f004bae671dcb7be18b0e2a6a97dde3bcbd512dc1c808851b5f947041a1a57f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -175,9 +182,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0462aa8951e81a0eb257d1c935bf7b26bc013a9bf16b00ae054badcc5158b8e62a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe347f1701f36f1c55bd2495f185034863f62c064a3eeb6aaf58e14f6c1ef7037",
-        "network" : "EIP158",
+        "lastblockhash" : "0x7d92515b9d132769de4add0b1174b8f2c7973faed685097bc856d91cac28fe5e",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114610039578063ed973fe91461004b57005b6100416100ea565b8060005260206000f35b61005361005d565b8060005260206000f35b60006000608161011a600039608160006000f0905073ffffffffffffffffffffffffffffffffffffffff811663b9c3d0a5602060007fb9c3d0a50000000000000000000000000000000000000000000000000000000081526004600060008660325a03f16100c757005b505060005160e1146100d8576100e1565b600191506100e6565b600091505b5090565b60006100f461005d565b600060006101000a81548160ff0219169083021790555060ff600160005404169050905600607580600c6000396000f3007c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f6004356055565b60006000f35b604b6070565b8060005260206000f35b8073ffffffffffffffffffffffffffffffffffffffff16ff50565b60e19056",
@@ -225,10 +239,10 @@
             }
         }
     },
-    "TestContractInteraction_d0g0v0_Frontier" : {
+    "TestContractInteraction_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestContractInteraction_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,19 +253,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x017c2d",
-                    "hash" : "0x18c5bff4c69f061642e26ebf3ddc6e20cc16c3660234f9c032f5ed615ef02545",
-                    "mixHash" : "0x0ec8b75c36f38c472445ff05ec4e67ec646161ffb82b7a3588b1dd3877e93f08",
-                    "nonce" : "0x72c673969b14f04c",
+                    "gasUsed" : "0x017fed",
+                    "hash" : "0x0a03413a79f628164e5306a99130e77381ea0433b3470cb4880ca58bc698b14a",
+                    "mixHash" : "0xa6994fdfd66e7d8883f6437fcfa8d1409626ef2c3f65d722c5800e81a9955cc5",
+                    "nonce" : "0x2bb28bb581cf0aad",
                     "number" : "0x01",
                     "parentHash" : "0x8e10ac293181f686b675698ee6dc83a2562e44b88cea608db92176af237ad948",
-                    "receiptTrie" : "0x0bb4481a3d0efefbd501530aec50d8f524c8eb4cb51fd39d31e320052ad81d75",
-                    "stateRoot" : "0x7740c3e1523290f52c55b3e1f132211370d9cced72d5e2726ced98c0ab12c9f0",
+                    "receiptTrie" : "0x7451788bea037f470e94646fd864b61b1d3f6bfc940434d81aa532fe890cf210",
+                    "stateRoot" : "0x9754b8e7df809273cd8c3a7269bc743e0010b2c2386683cb80975d4b6a81ee63",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f9a08e10ac293181f686b675698ee6dc83a2562e44b88cea608db92176af237ad948a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07740c3e1523290f52c55b3e1f132211370d9cced72d5e2726ced98c0ab12c9f0a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a00bb4481a3d0efefbd501530aec50d8f524c8eb4cb51fd39d31e320052ad81d75b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083017c2d8203e880a00ec8b75c36f38c472445ff05ec4e67ec646161ffb82b7a3588b1dd3877e93f088872c673969b14f04cf866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "rlp" : "0xf90265f901f9a08e10ac293181f686b675698ee6dc83a2562e44b88cea608db92176af237ad948a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09754b8e7df809273cd8c3a7269bc743e0010b2c2386683cb80975d4b6a81ee63a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a07451788bea037f470e94646fd864b61b1d3f6bfc940434d81aa532fe890cf210b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083017fed8203e880a0a6994fdfd66e7d8883f6437fcfa8d1409626ef2c3f65d722c5800e81a9955cc5882bb28bb581cf0aadf866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -288,8 +302,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0462aa8951e81a0eb257d1c935bf7b26bc013a9bf16b00ae054badcc5158b8e62a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x18c5bff4c69f061642e26ebf3ddc6e20cc16c3660234f9c032f5ed615ef02545",
-        "network" : "Frontier",
+        "lastblockhash" : "0x0a03413a79f628164e5306a99130e77381ea0433b3470cb4880ca58bc698b14a",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
@@ -300,14 +314,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f57c2d",
+                "balance" : "0x4563918244f57fed",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0dc612",
+                "balance" : "0x0dc252",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -338,10 +352,123 @@
             }
         }
     },
-    "TestContractInteraction_d0g0v0_Homestead" : {
+    "TestContractInteraction_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestContractInteraction_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x017fed",
+                    "hash" : "0xd010c9acf0f8e310c3b09320e54973b4452b6df66c34974b742ef41541a6cad9",
+                    "mixHash" : "0xd9ff45ff77b898f111b7bce3bee3dfe0ebbee76e492281d668798952cc2eab2c",
+                    "nonce" : "0xdbf5a5fbe1c27e30",
+                    "number" : "0x01",
+                    "parentHash" : "0x8e10ac293181f686b675698ee6dc83a2562e44b88cea608db92176af237ad948",
+                    "receiptTrie" : "0xea48afaffd1d1e0d9f833729e5bac9d3460837228a55c5513291e76151eee925",
+                    "stateRoot" : "0x6c941e0fbc6f9f989e905dbe2dbf3016a3ed33a18097c82877cea14e94f7138a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90265f901f9a08e10ac293181f686b675698ee6dc83a2562e44b88cea608db92176af237ad948a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c941e0fbc6f9f989e905dbe2dbf3016a3ed33a18097c82877cea14e94f7138aa0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0ea48afaffd1d1e0d9f833729e5bac9d3460837228a55c5513291e76151eee925b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083017fed8203e880a0d9ff45ff77b898f111b7bce3bee3dfe0ebbee76e492281d668798952cc2eab2c88dbf5a5fbe1c27e30f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x055730",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xde52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5e",
+                        "s" : "0x76154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7f",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x8e10ac293181f686b675698ee6dc83a2562e44b88cea608db92176af237ad948",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x462aa8951e81a0eb257d1c935bf7b26bc013a9bf16b00ae054badcc5158b8e62",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0462aa8951e81a0eb257d1c935bf7b26bc013a9bf16b00ae054badcc5158b8e62a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd010c9acf0f8e310c3b09320e54973b4452b6df66c34974b742ef41541a6cad9",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a1",
+                "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114610039578063ed973fe91461004b57005b6100416100ea565b8060005260206000f35b61005361005d565b8060005260206000f35b60006000608161011a600039608160006000f0905073ffffffffffffffffffffffffffffffffffffffff811663b9c3d0a5602060007fb9c3d0a50000000000000000000000000000000000000000000000000000000081526004600060008660325a03f16100c757005b505060005160e1146100d8576100e1565b600191506100e6565b600091505b5090565b60006100f461005d565b600060006101000a81548160ff0219169083021790555060ff600160005404169050905600607580600c6000396000f3007c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f6004356055565b60006000f35b604b6070565b8060005260206000f35b8073ffffffffffffffffffffffffffffffffffffffff16ff50565b60e19056",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f57fed",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0dc252",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
+                "balance" : "0x00",
+                "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f6004356055565b60006000f35b604b6070565b8060005260206000f35b8073ffffffffffffffffffffffffffffffffffffffff16ff50565b60e19056",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114610039578063ed973fe91461004b57005b6100416100ea565b8060005260206000f35b61005361005d565b8060005260206000f35b60006000608161011a600039608160006000f0905073ffffffffffffffffffffffffffffffffffffffff811663b9c3d0a5602060007fb9c3d0a50000000000000000000000000000000000000000000000000000000081526004600060008660325a03f16100c757005b505060005160e1146100d8576100e1565b600191506100e6565b600091505b5090565b60006100f461005d565b600060006101000a81548160ff0219169083021790555060ff600160005404169050905600607580600c6000396000f3007c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f6004356055565b60006000f35b604b6070565b8060005260206000f35b8073ffffffffffffffffffffffffffffffffffffffff16ff50565b60e19056",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "TestContractInteraction_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestContractInteraction_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -353,9 +480,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x017c2d",
-                    "hash" : "0xc7f0271b522402ce658e4a045929dbc01b952d5d145268f201a6d1cdfce024dd",
-                    "mixHash" : "0x06c92887d3786431947ea3f5aff77c0e13af56401a2e6d029da39dcca2679b0f",
-                    "nonce" : "0x832cf08aa2d5a613",
+                    "hash" : "0x65d7a9496aa9e0cada283cb249b4bd6b9938542570a92648ac6e5dac59422394",
+                    "mixHash" : "0xbf5ba9a6f4834f6f7b93dc68ea1b5f9e6903a34c9f31949daf7c6283417b5c1e",
+                    "nonce" : "0x0aafa6eccc549ae3",
                     "number" : "0x01",
                     "parentHash" : "0x8e10ac293181f686b675698ee6dc83a2562e44b88cea608db92176af237ad948",
                     "receiptTrie" : "0x0bb4481a3d0efefbd501530aec50d8f524c8eb4cb51fd39d31e320052ad81d75",
@@ -364,7 +491,7 @@
                     "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f9a08e10ac293181f686b675698ee6dc83a2562e44b88cea608db92176af237ad948a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07740c3e1523290f52c55b3e1f132211370d9cced72d5e2726ced98c0ab12c9f0a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a00bb4481a3d0efefbd501530aec50d8f524c8eb4cb51fd39d31e320052ad81d75b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083017c2d8203e880a006c92887d3786431947ea3f5aff77c0e13af56401a2e6d029da39dcca2679b0f88832cf08aa2d5a613f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "rlp" : "0xf90265f901f9a08e10ac293181f686b675698ee6dc83a2562e44b88cea608db92176af237ad948a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07740c3e1523290f52c55b3e1f132211370d9cced72d5e2726ced98c0ab12c9f0a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a00bb4481a3d0efefbd501530aec50d8f524c8eb4cb51fd39d31e320052ad81d75b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083017c2d8203e880a0bf5ba9a6f4834f6f7b93dc68ea1b5f9e6903a34c9f31949daf7c6283417b5c1e880aafa6eccc549ae3f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -401,8 +528,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0462aa8951e81a0eb257d1c935bf7b26bc013a9bf16b00ae054badcc5158b8e62a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc7f0271b522402ce658e4a045929dbc01b952d5d145268f201a6d1cdfce024dd",
-        "network" : "Homestead",
+        "lastblockhash" : "0x65d7a9496aa9e0cada283cb249b4bd6b9938542570a92648ac6e5dac59422394",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
@@ -451,10 +578,10 @@
             }
         }
     },
-    "TestContractInteraction_d0g0v0_Metropolis" : {
+    "TestContractInteraction_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/stSolidityTest/TestContractInteraction_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -465,19 +592,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x017fed",
-                    "hash" : "0x6cae885916bb60e3a33a1f318f7523f53ffbf5cb60cc6428bb13e14c66af6f57",
-                    "mixHash" : "0x19a2f23983bd426289b6c4042883f5ac940dd480ae05a7ee8251b9ad73bed918",
-                    "nonce" : "0x37f7732c6acb8c9a",
+                    "gasUsed" : "0x017c2d",
+                    "hash" : "0x9297fbeb9bc8ba56f7c5a94692751241e34b6cd539db97d2b40d16854dd9690f",
+                    "mixHash" : "0x9ba09f98e8e0727a5bc6356896c8fdcf5cdfe81881576b85cf8425d14f4043cb",
+                    "nonce" : "0xd19342da8a3ae431",
                     "number" : "0x01",
                     "parentHash" : "0x8e10ac293181f686b675698ee6dc83a2562e44b88cea608db92176af237ad948",
-                    "receiptTrie" : "0x452fecf46d840243c7420dac6bc11358533286d57463a4d21cdc53611849e27e",
-                    "stateRoot" : "0x1046c6d1986019098ee3114d1bb9e92066a7b5bdc7379bc23e6ccdb94b256229",
+                    "receiptTrie" : "0x0bb4481a3d0efefbd501530aec50d8f524c8eb4cb51fd39d31e320052ad81d75",
+                    "stateRoot" : "0x7740c3e1523290f52c55b3e1f132211370d9cced72d5e2726ced98c0ab12c9f0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f9a08e10ac293181f686b675698ee6dc83a2562e44b88cea608db92176af237ad948a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01046c6d1986019098ee3114d1bb9e92066a7b5bdc7379bc23e6ccdb94b256229a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0452fecf46d840243c7420dac6bc11358533286d57463a4d21cdc53611849e27eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083017fed8203e880a019a2f23983bd426289b6c4042883f5ac940dd480ae05a7ee8251b9ad73bed9188837f7732c6acb8c9af866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "rlp" : "0xf90265f901f9a08e10ac293181f686b675698ee6dc83a2562e44b88cea608db92176af237ad948a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07740c3e1523290f52c55b3e1f132211370d9cced72d5e2726ced98c0ab12c9f0a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a00bb4481a3d0efefbd501530aec50d8f524c8eb4cb51fd39d31e320052ad81d75b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083017c2d8203e880a09ba09f98e8e0727a5bc6356896c8fdcf5cdfe81881576b85cf8425d14f4043cb88d19342da8a3ae431f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -514,16 +641,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0462aa8951e81a0eb257d1c935bf7b26bc013a9bf16b00ae054badcc5158b8e62a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6cae885916bb60e3a33a1f318f7523f53ffbf5cb60cc6428bb13e14c66af6f57",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x9297fbeb9bc8ba56f7c5a94692751241e34b6cd539db97d2b40d16854dd9690f",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114610039578063ed973fe91461004b57005b6100416100ea565b8060005260206000f35b61005361005d565b8060005260206000f35b60006000608161011a600039608160006000f0905073ffffffffffffffffffffffffffffffffffffffff811663b9c3d0a5602060007fb9c3d0a50000000000000000000000000000000000000000000000000000000081526004600060008660325a03f16100c757005b505060005160e1146100d8576100e1565b600191506100e6565b600091505b5090565b60006100f461005d565b600060006101000a81548160ff0219169083021790555060ff600160005404169050905600607580600c6000396000f3007c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f6004356055565b60006000f35b604b6070565b8060005260206000f35b8073ffffffffffffffffffffffffffffffffffffffff16ff50565b60e19056",
@@ -533,14 +653,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f57fed",
+                "balance" : "0x4563918244f57c2d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0dc252",
+                "balance" : "0x0dc612",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -549,7 +669,7 @@
             "0xd2571607e241ecf590ed94b12d87c94babe36db6" : {
                 "balance" : "0x00",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f6004356055565b60006000f35b604b6070565b8060005260206000f35b8073ffffffffffffffffffffffffffffffffffffffff16ff50565b60e19056",
-                "nonce" : "0x01",
+                "nonce" : "0x00",
                 "storage" : {
                 }
             }
diff --git a/BlockchainTests/GeneralStateTests/stSolidityTest/TestContractSuicide_d0g0v0.json b/BlockchainTests/GeneralStateTests/stSolidityTest/TestContractSuicide_d0g0v0.json
index 7a310724b..0c159c351 100644
--- a/BlockchainTests/GeneralStateTests/stSolidityTest/TestContractSuicide_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stSolidityTest/TestContractSuicide_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "TestContractSuicide_d0g0v0_EIP150" : {
+    "TestContractSuicide_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestContractSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x019ac7",
-                    "hash" : "0xa1d95c48444c5ff0f5aa127cdb7cc966f84492dc6c91700ba0f53ff5f8b2d3df",
-                    "mixHash" : "0x5895abf35b85d0883e0d117b8586b4cf01a4b48f102569dbc74071c8eaa0835c",
-                    "nonce" : "0x9cf7edf25d9f30fe",
+                    "gasUsed" : "0x01391f",
+                    "hash" : "0xe5e3258cdd86d1211b7e21309a99f6977845e1542cd2fb30e3b67366d0edb36a",
+                    "mixHash" : "0x11c283d4690d2e2be09d79ee6cd4f5f12cf8e7fe7da11eedf6ef3f9b116e955d",
+                    "nonce" : "0x08c95114e60b05d9",
                     "number" : "0x01",
                     "parentHash" : "0xdbfee504e63a28ed3ed8f0a1237d0a91797cfe1fbb0c6518232c45af7d8b2ebb",
-                    "receiptTrie" : "0x88effe48eee9be4fb131b69701bd61dfba301aa522c3ed890959dc02f6624762",
-                    "stateRoot" : "0xa1f975df807e15ad63fe3cb2f8ec5dbaadafeb9b3b0ff0349f5973c563932873",
+                    "receiptTrie" : "0xb7a97432ba26727535e2560445bb1b493738206726b00b79fbc66355dd19c206",
+                    "stateRoot" : "0x42092cd4b619c1b30ae5e29afec32928d4367dc4412e5c22877246d8759ac2bb",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f9a0dbfee504e63a28ed3ed8f0a1237d0a91797cfe1fbb0c6518232c45af7d8b2ebba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a1f975df807e15ad63fe3cb2f8ec5dbaadafeb9b3b0ff0349f5973c563932873a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a088effe48eee9be4fb131b69701bd61dfba301aa522c3ed890959dc02f6624762b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083019ac78203e880a05895abf35b85d0883e0d117b8586b4cf01a4b48f102569dbc74071c8eaa0835c889cf7edf25d9f30fef866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "rlp" : "0xf90265f901f9a0dbfee504e63a28ed3ed8f0a1237d0a91797cfe1fbb0c6518232c45af7d8b2ebba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa042092cd4b619c1b30ae5e29afec32928d4367dc4412e5c22877246d8759ac2bba0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0b7a97432ba26727535e2560445bb1b493738206726b00b79fbc66355dd19c206b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301391f8203e880a011c283d4690d2e2be09d79ee6cd4f5f12cf8e7fe7da11eedf6ef3f9b116e955d8808c95114e60b05d9f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bddafbf36a4d04d4f410bcac7b94c424576f28fcec0cc6a1490c0175dc853e13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa1d95c48444c5ff0f5aa127cdb7cc966f84492dc6c91700ba0f53ff5f8b2d3df",
-        "network" : "EIP150",
+        "lastblockhash" : "0xe5e3258cdd86d1211b7e21309a99f6977845e1542cd2fb30e3b67366d0edb36a",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463a60eedda8114610039578063c04062261461004b57005b61004161005d565b8060005260206000f35b61005361015a565b8060005260206000f35b60006000608161018a600039608160006000f0905073ffffffffffffffffffffffffffffffffffffffff811662f55d9d6000807ef55d9d00000000000000000000000000000000000000000000000000000000825260044173ffffffffffffffffffffffffffffffffffffffff168152602001600060008660325a03f16100e057005b505073ffffffffffffffffffffffffffffffffffffffff811663b9c3d0a5602060007fb9c3d0a50000000000000000000000000000000000000000000000000000000081526004600060008660325a03f161013757005b505060005160e11461014857610151565b60019150610156565b600091505b5090565b600061016461005d565b600060006101000a81548160ff0219169083021790555060ff600160005404169050905600607580600c6000396000f3007c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f600435605a565b60006000f35b604b6055565b8060005260206000f35b60e190565b8073ffffffffffffffffffffffffffffffffffffffff16ff5056",
@@ -74,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f59ac7",
+                "balance" : "0x4563918244f5391f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0da778",
+                "balance" : "0x0e0920",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -105,10 +112,10 @@
             }
         }
     },
-    "TestContractSuicide_d0g0v0_EIP158" : {
+    "TestContractSuicide_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/stSolidityTest/TestContractSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0x01391f",
-                    "hash" : "0x81b96d49fe1ec88282907ae60d28ca19623964e0fee8d2e77d05fa7716b4e1fc",
-                    "mixHash" : "0xf84f2b49a110e27182c67ae6e3e8c6888ab9656ddbf9bbf35b78b42ee97ce25d",
-                    "nonce" : "0xa6ddb915a12c5ce4",
+                    "hash" : "0x60fbeded8c22be9ae334116536992b0d9a0226e4f4b0d716c72946cb3de6d30e",
+                    "mixHash" : "0x1bdcecbc57ce8426b56ba1277f297a1204d55fab76e2c6552ba64ac63034a07b",
+                    "nonce" : "0xe29a461905fa61af",
                     "number" : "0x01",
                     "parentHash" : "0xdbfee504e63a28ed3ed8f0a1237d0a91797cfe1fbb0c6518232c45af7d8b2ebb",
-                    "receiptTrie" : "0xe7acca56821b0e733a3c527798da8c8bf980b124ee123368874ba2e8c2818431",
-                    "stateRoot" : "0x9ee5b8a6d3dd211903f9f00b1cb3accc82af983ed3c388da8c934e1343ad1c83",
+                    "receiptTrie" : "0xb7a97432ba26727535e2560445bb1b493738206726b00b79fbc66355dd19c206",
+                    "stateRoot" : "0x42092cd4b619c1b30ae5e29afec32928d4367dc4412e5c22877246d8759ac2bb",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f9a0dbfee504e63a28ed3ed8f0a1237d0a91797cfe1fbb0c6518232c45af7d8b2ebba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09ee5b8a6d3dd211903f9f00b1cb3accc82af983ed3c388da8c934e1343ad1c83a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0e7acca56821b0e733a3c527798da8c8bf980b124ee123368874ba2e8c2818431b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301391f8203e880a0f84f2b49a110e27182c67ae6e3e8c6888ab9656ddbf9bbf35b78b42ee97ce25d88a6ddb915a12c5ce4f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "rlp" : "0xf90265f901f9a0dbfee504e63a28ed3ed8f0a1237d0a91797cfe1fbb0c6518232c45af7d8b2ebba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa042092cd4b619c1b30ae5e29afec32928d4367dc4412e5c22877246d8759ac2bba0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0b7a97432ba26727535e2560445bb1b493738206726b00b79fbc66355dd19c206b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301391f8203e880a01bdcecbc57ce8426b56ba1277f297a1204d55fab76e2c6552ba64ac63034a07b88e29a461905fa61aff866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bddafbf36a4d04d4f410bcac7b94c424576f28fcec0cc6a1490c0175dc853e13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x81b96d49fe1ec88282907ae60d28ca19623964e0fee8d2e77d05fa7716b4e1fc",
-        "network" : "EIP158",
+        "lastblockhash" : "0x60fbeded8c22be9ae334116536992b0d9a0226e4f4b0d716c72946cb3de6d30e",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463a60eedda8114610039578063c04062261461004b57005b61004161005d565b8060005260206000f35b61005361015a565b8060005260206000f35b60006000608161018a600039608160006000f0905073ffffffffffffffffffffffffffffffffffffffff811662f55d9d6000807ef55d9d00000000000000000000000000000000000000000000000000000000825260044173ffffffffffffffffffffffffffffffffffffffff168152602001600060008660325a03f16100e057005b505073ffffffffffffffffffffffffffffffffffffffff811663b9c3d0a5602060007fb9c3d0a50000000000000000000000000000000000000000000000000000000081526004600060008660325a03f161013757005b505060005160e11461014857610151565b60019150610156565b600091505b5090565b600061016461005d565b600060006101000a81548160ff0219169083021790555060ff600160005404169050905600607580600c6000396000f3007c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f600435605a565b60006000f35b604b6055565b8060005260206000f35b60e190565b8073ffffffffffffffffffffffffffffffffffffffff16ff5056",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "TestContractSuicide_d0g0v0_Frontier" : {
+    "TestContractSuicide_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestContractSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +239,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x011f43",
-                    "hash" : "0xcdd3c3e1180c953e4864129aa6647eeb3f6b19810b3d7b8c73aa5afa795fba83",
-                    "mixHash" : "0xeb72e1e7506f70b075fb62d9cdcc221ff43c29a0a00b1f1b2b47c941347114bf",
-                    "nonce" : "0xddb02fe4b6a1de57",
+                    "gasUsed" : "0x019ac7",
+                    "hash" : "0xd9d53213fa64327dd15ab18aec914d210e9b0548350bf6b9bbe91af853bff3e9",
+                    "mixHash" : "0xed8d7403e7ac429fc67946c0291a9ed4adaa64def02bda0c60c63afd21991d24",
+                    "nonce" : "0xa39a0e8811fda2c6",
                     "number" : "0x01",
                     "parentHash" : "0xdbfee504e63a28ed3ed8f0a1237d0a91797cfe1fbb0c6518232c45af7d8b2ebb",
-                    "receiptTrie" : "0xc26a3d812abc0984ee932fb8fd12e030aec1c77bb7260c67e4c7bddb1603d16c",
-                    "stateRoot" : "0xdaefd1cdd24db812702bea1fae2ef9919f84a0f50d2b5a4951b8f15c2e6b9889",
+                    "receiptTrie" : "0x88effe48eee9be4fb131b69701bd61dfba301aa522c3ed890959dc02f6624762",
+                    "stateRoot" : "0xa1f975df807e15ad63fe3cb2f8ec5dbaadafeb9b3b0ff0349f5973c563932873",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f9a0dbfee504e63a28ed3ed8f0a1237d0a91797cfe1fbb0c6518232c45af7d8b2ebba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0daefd1cdd24db812702bea1fae2ef9919f84a0f50d2b5a4951b8f15c2e6b9889a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0c26a3d812abc0984ee932fb8fd12e030aec1c77bb7260c67e4c7bddb1603d16cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083011f438203e880a0eb72e1e7506f70b075fb62d9cdcc221ff43c29a0a00b1f1b2b47c941347114bf88ddb02fe4b6a1de57f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "rlp" : "0xf90265f901f9a0dbfee504e63a28ed3ed8f0a1237d0a91797cfe1fbb0c6518232c45af7d8b2ebba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a1f975df807e15ad63fe3cb2f8ec5dbaadafeb9b3b0ff0349f5973c563932873a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a088effe48eee9be4fb131b69701bd61dfba301aa522c3ed890959dc02f6624762b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083019ac78203e880a0ed8d7403e7ac429fc67946c0291a9ed4adaa64def02bda0c60c63afd21991d2488a39a0e8811fda2c6f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bddafbf36a4d04d4f410bcac7b94c424576f28fcec0cc6a1490c0175dc853e13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcdd3c3e1180c953e4864129aa6647eeb3f6b19810b3d7b8c73aa5afa795fba83",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd9d53213fa64327dd15ab18aec914d210e9b0548350bf6b9bbe91af853bff3e9",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
@@ -286,14 +300,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51f43",
+                "balance" : "0x4563918244f59ac7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0e22fc",
+                "balance" : "0x0da778",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +331,10 @@
             }
         }
     },
-    "TestContractSuicide_d0g0v0_Homestead" : {
+    "TestContractSuicide_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestContractSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -331,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x011f43",
-                    "hash" : "0xb707177aea58448a01e4265454197d8c3c5ade9e8a7d7e9b28edf35504b5bb2b",
-                    "mixHash" : "0x446327b96babd88f14af0c1f3193c60a50983c432770d562d4ce437feafd1f84",
-                    "nonce" : "0x50906b5364372373",
+                    "gasUsed" : "0x01391f",
+                    "hash" : "0x9b5c66f6aaddbd8af1bc4d0b3e00c09a506e9be7ffdd90039bfe80b3d0b673d5",
+                    "mixHash" : "0xa7c73b84219ebb0a1718885264b721bf324669d272ba316afc7763beb6f21430",
+                    "nonce" : "0xdcb1391622e24cf1",
                     "number" : "0x01",
                     "parentHash" : "0xdbfee504e63a28ed3ed8f0a1237d0a91797cfe1fbb0c6518232c45af7d8b2ebb",
-                    "receiptTrie" : "0xc26a3d812abc0984ee932fb8fd12e030aec1c77bb7260c67e4c7bddb1603d16c",
-                    "stateRoot" : "0xdaefd1cdd24db812702bea1fae2ef9919f84a0f50d2b5a4951b8f15c2e6b9889",
+                    "receiptTrie" : "0xe7acca56821b0e733a3c527798da8c8bf980b124ee123368874ba2e8c2818431",
+                    "stateRoot" : "0x9ee5b8a6d3dd211903f9f00b1cb3accc82af983ed3c388da8c934e1343ad1c83",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f9a0dbfee504e63a28ed3ed8f0a1237d0a91797cfe1fbb0c6518232c45af7d8b2ebba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0daefd1cdd24db812702bea1fae2ef9919f84a0f50d2b5a4951b8f15c2e6b9889a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0c26a3d812abc0984ee932fb8fd12e030aec1c77bb7260c67e4c7bddb1603d16cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083011f438203e880a0446327b96babd88f14af0c1f3193c60a50983c432770d562d4ce437feafd1f848850906b5364372373f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "rlp" : "0xf90265f901f9a0dbfee504e63a28ed3ed8f0a1237d0a91797cfe1fbb0c6518232c45af7d8b2ebba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09ee5b8a6d3dd211903f9f00b1cb3accc82af983ed3c388da8c934e1343ad1c83a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0e7acca56821b0e733a3c527798da8c8bf980b124ee123368874ba2e8c2818431b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301391f8203e880a0a7c73b84219ebb0a1718885264b721bf324669d272ba316afc7763beb6f2143088dcb1391622e24cf1f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bddafbf36a4d04d4f410bcac7b94c424576f28fcec0cc6a1490c0175dc853e13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb707177aea58448a01e4265454197d8c3c5ade9e8a7d7e9b28edf35504b5bb2b",
-        "network" : "Homestead",
+        "lastblockhash" : "0x9b5c66f6aaddbd8af1bc4d0b3e00c09a506e9be7ffdd90039bfe80b3d0b673d5",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
@@ -392,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51f43",
+                "balance" : "0x4563918244f5391f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0e22fc",
+                "balance" : "0x0e0920",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -423,10 +437,10 @@
             }
         }
     },
-    "TestContractSuicide_d0g0v0_Metropolis" : {
+    "TestContractSuicide_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestContractSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +451,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0x01391f",
-                    "hash" : "0x1132fddf3a9be009b9ae564d5e53ff7c4cff4930fa21e9f431db6e862c6b0904",
-                    "mixHash" : "0xcb3905a9a1dc916bbbfa7c3e2e927f836dd61911c90a3ebc3455a7902cb20b2c",
-                    "nonce" : "0xad23991537f2642e",
+                    "gasUsed" : "0x011f43",
+                    "hash" : "0xa2fa8f11befaa5da17d47fe682ad444eb6152d02560c83af13b5d531be8caa1a",
+                    "mixHash" : "0x3420da27665266aaaa4bae9af641b2b75f0ad5f7a89fbc4ffcaaf0e0d4f46761",
+                    "nonce" : "0x0dc93843bf5db28d",
                     "number" : "0x01",
                     "parentHash" : "0xdbfee504e63a28ed3ed8f0a1237d0a91797cfe1fbb0c6518232c45af7d8b2ebb",
-                    "receiptTrie" : "0xb7a97432ba26727535e2560445bb1b493738206726b00b79fbc66355dd19c206",
-                    "stateRoot" : "0x42092cd4b619c1b30ae5e29afec32928d4367dc4412e5c22877246d8759ac2bb",
+                    "receiptTrie" : "0xc26a3d812abc0984ee932fb8fd12e030aec1c77bb7260c67e4c7bddb1603d16c",
+                    "stateRoot" : "0xdaefd1cdd24db812702bea1fae2ef9919f84a0f50d2b5a4951b8f15c2e6b9889",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901f9a0dbfee504e63a28ed3ed8f0a1237d0a91797cfe1fbb0c6518232c45af7d8b2ebba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa042092cd4b619c1b30ae5e29afec32928d4367dc4412e5c22877246d8759ac2bba0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0b7a97432ba26727535e2560445bb1b493738206726b00b79fbc66355dd19c206b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e1008301391f8203e880a0cb3905a9a1dc916bbbfa7c3e2e927f836dd61911c90a3ebc3455a7902cb20b2c88ad23991537f2642ef866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "rlp" : "0xf90265f901f9a0dbfee504e63a28ed3ed8f0a1237d0a91797cfe1fbb0c6518232c45af7d8b2ebba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0daefd1cdd24db812702bea1fae2ef9919f84a0f50d2b5a4951b8f15c2e6b9889a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0c26a3d812abc0984ee932fb8fd12e030aec1c77bb7260c67e4c7bddb1603d16cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083011f438203e880a03420da27665266aaaa4bae9af641b2b75f0ad5f7a89fbc4ffcaaf0e0d4f46761880dc93843bf5db28df866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bddafbf36a4d04d4f410bcac7b94c424576f28fcec0cc6a1490c0175dc853e13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1132fddf3a9be009b9ae564d5e53ff7c4cff4930fa21e9f431db6e862c6b0904",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xa2fa8f11befaa5da17d47fe682ad444eb6152d02560c83af13b5d531be8caa1a",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a1",
+                "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463a60eedda8114610039578063c04062261461004b57005b61004161005d565b8060005260206000f35b61005361015a565b8060005260206000f35b60006000608161018a600039608160006000f0905073ffffffffffffffffffffffffffffffffffffffff811662f55d9d6000807ef55d9d00000000000000000000000000000000000000000000000000000000825260044173ffffffffffffffffffffffffffffffffffffffff168152602001600060008660325a03f16100e057005b505073ffffffffffffffffffffffffffffffffffffffff811663b9c3d0a5602060007fb9c3d0a50000000000000000000000000000000000000000000000000000000081526004600060008660325a03f161013757005b505060005160e11461014857610151565b60019150610156565b600091505b5090565b600061016461005d565b600060006101000a81548160ff0219169083021790555060ff600160005404169050905600607580600c6000396000f3007c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f600435605a565b60006000f35b604b6055565b8060005260206000f35b60e190565b8073ffffffffffffffffffffffffffffffffffffffff16ff5056",
+                "nonce" : "0x01",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f51f43",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0e22fc",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463a60eedda8114610039578063c04062261461004b57005b61004161005d565b8060005260206000f35b61005361015a565b8060005260206000f35b60006000608161018a600039608160006000f0905073ffffffffffffffffffffffffffffffffffffffff811662f55d9d6000807ef55d9d00000000000000000000000000000000000000000000000000000000825260044173ffffffffffffffffffffffffffffffffffffffff168152602001600060008660325a03f16100e057005b505073ffffffffffffffffffffffffffffffffffffffff811663b9c3d0a5602060007fb9c3d0a50000000000000000000000000000000000000000000000000000000081526004600060008660325a03f161013757005b505060005160e11461014857610151565b60019150610156565b600091505b5090565b600061016461005d565b600060006101000a81548160ff0219169083021790555060ff600160005404169050905600607580600c6000396000f3007c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f600435605a565b60006000f35b604b6055565b8060005260206000f35b60e190565b8073ffffffffffffffffffffffffffffffffffffffff16ff5056",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "TestContractSuicide_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestContractSuicide_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0x011f43",
+                    "hash" : "0x412a27062417692a1a3df949fb40ce98d927a9d424fc8091a550d70093535ae7",
+                    "mixHash" : "0x389c68dde0465c4d51ca92740af37ed0e4c3face1a0f4f5168ac271736f051e6",
+                    "nonce" : "0xa4ca7c8d4cb7c9d5",
+                    "number" : "0x01",
+                    "parentHash" : "0xdbfee504e63a28ed3ed8f0a1237d0a91797cfe1fbb0c6518232c45af7d8b2ebb",
+                    "receiptTrie" : "0xc26a3d812abc0984ee932fb8fd12e030aec1c77bb7260c67e4c7bddb1603d16c",
+                    "stateRoot" : "0xdaefd1cdd24db812702bea1fae2ef9919f84a0f50d2b5a4951b8f15c2e6b9889",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90265f901f9a0dbfee504e63a28ed3ed8f0a1237d0a91797cfe1fbb0c6518232c45af7d8b2ebba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0daefd1cdd24db812702bea1fae2ef9919f84a0f50d2b5a4951b8f15c2e6b9889a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0c26a3d812abc0984ee932fb8fd12e030aec1c77bb7260c67e4c7bddb1603d16cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10083011f438203e880a0389c68dde0465c4d51ca92740af37ed0e4c3face1a0f4f5168ac271736f051e688a4ca7c8d4cb7c9d5f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x055730",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xde52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5e",
+                        "s" : "0x76154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7f",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0xdbfee504e63a28ed3ed8f0a1237d0a91797cfe1fbb0c6518232c45af7d8b2ebb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xbddafbf36a4d04d4f410bcac7b94c424576f28fcec0cc6a1490c0175dc853e13",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bddafbf36a4d04d4f410bcac7b94c424576f28fcec0cc6a1490c0175dc853e13a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x412a27062417692a1a3df949fb40ce98d927a9d424fc8091a550d70093535ae7",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463a60eedda8114610039578063c04062261461004b57005b61004161005d565b8060005260206000f35b61005361015a565b8060005260206000f35b60006000608161018a600039608160006000f0905073ffffffffffffffffffffffffffffffffffffffff811662f55d9d6000807ef55d9d00000000000000000000000000000000000000000000000000000000825260044173ffffffffffffffffffffffffffffffffffffffff168152602001600060008660325a03f16100e057005b505073ffffffffffffffffffffffffffffffffffffffff811663b9c3d0a5602060007fb9c3d0a50000000000000000000000000000000000000000000000000000000081526004600060008660325a03f161013757005b505060005160e11461014857610151565b60019150610156565b600091505b5090565b600061016461005d565b600060006101000a81548160ff0219169083021790555060ff600160005404169050905600607580600c6000396000f3007c01000000000000000000000000000000000000000000000000000000006000350462f55d9d81146036578063b9c3d0a514604557005b603f600435605a565b60006000f35b604b6055565b8060005260206000f35b60e190565b8073ffffffffffffffffffffffffffffffffffffffff16ff5056",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5391f",
+                "balance" : "0x4563918244f51f43",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0e0920",
+                "balance" : "0x0e22fc",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stSolidityTest/TestCryptographicFunctions_d0g0v0.json b/BlockchainTests/GeneralStateTests/stSolidityTest/TestCryptographicFunctions_d0g0v0.json
index 36e46f3d8..0b4b055f4 100644
--- a/BlockchainTests/GeneralStateTests/stSolidityTest/TestCryptographicFunctions_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stSolidityTest/TestCryptographicFunctions_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "TestCryptographicFunctions_d0g0v0_EIP150" : {
+    "TestCryptographicFunctions_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestCryptographicFunctions_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x01e1be",
-                    "hash" : "0xa0dbdfbbaaf82ae9eb1ef8b2b76fdc95a885eaed80443a3fd7ad040394494c35",
-                    "mixHash" : "0x4a61ef1f3792c82bd97b589fe6547b4693f7b5e6f2bec6df7ba14de54c0e65bd",
-                    "nonce" : "0xc7f2aafb7e4c4b04",
+                    "gasUsed" : "0xbcc6",
+                    "hash" : "0x08324641a3018b9e67222723d2ae151530dceba0dc338adf464ae588de78ddff",
+                    "mixHash" : "0x3bdd4d18ba66eee34ed805cc298112671bf6f94585c9c01849cdb44f3c4b5edd",
+                    "nonce" : "0xbc93028ffd239bb5",
                     "number" : "0x01",
                     "parentHash" : "0xdf31f26e5dcb7e53609af62d501fdbab0b9eb2028bf9032eb0ac6ca23931102b",
-                    "receiptTrie" : "0x34d5b774fb8901a1d81fe8970eb2bf277341bc244415fa9a237a0c60faffd2d0",
-                    "stateRoot" : "0xe61717548182f12eb1664faaa7c82d3a77bad76268f9d2581365bf54e2812fe1",
+                    "receiptTrie" : "0x039ed60098a818a86bcb28efb76238766651e106559da0a6d1c5e29aa5e61621",
+                    "stateRoot" : "0xde924411d2f2926460aabac9748c53427315f33c6db217c8973f21427401dac9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8434166e881be58d6b74fb77ff3332a435208864dfc1bb330b4ea7d6c526997f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0df31f26e5dcb7e53609af62d501fdbab0b9eb2028bf9032eb0ac6ca23931102ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e61717548182f12eb1664faaa7c82d3a77bad76268f9d2581365bf54e2812fe1a08434166e881be58d6b74fb77ff3332a435208864dfc1bb330b4ea7d6c526997fa034d5b774fb8901a1d81fe8970eb2bf277341bc244415fa9a237a0c60faffd2d0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301e1be8203e880a04a61ef1f3792c82bd97b589fe6547b4693f7b5e6f2bec6df7ba14de54c0e65bd88c7f2aafb7e4c4b04f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba034e6c6b7a2fcc20a447bcdef520b713a01c8f74084738aa93e72b466eba8c24da06ad238d471308dfcc7eef68b089a9866d611825f5bedeea7952dbf69afb8c18fc0",
+                "rlp" : "0xf90269f901fca0df31f26e5dcb7e53609af62d501fdbab0b9eb2028bf9032eb0ac6ca23931102ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de924411d2f2926460aabac9748c53427315f33c6db217c8973f21427401dac9a08434166e881be58d6b74fb77ff3332a435208864dfc1bb330b4ea7d6c526997fa0039ed60098a818a86bcb28efb76238766651e106559da0a6d1c5e29aa5e61621b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bcc68203e880a03bdd4d18ba66eee34ed805cc298112671bf6f94585c9c01849cdb44f3c4b5edd88bc93028ffd239bb5f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba034e6c6b7a2fcc20a447bcdef520b713a01c8f74084738aa93e72b466eba8c24da06ad238d471308dfcc7eef68b089a9866d611825f5bedeea7952dbf69afb8c18fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,24 +62,10 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f2e3a9a359399f54acfe449ed11bae9cd52926dcdf6729f2c57aadbe3a0aa04ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa0dbdfbbaaf82ae9eb1ef8b2b76fdc95a885eaed80443a3fd7ad040394494c35",
-        "network" : "EIP150",
+        "lastblockhash" : "0x08324641a3018b9e67222723d2ae151530dceba0dc338adf464ae588de78ddff",
+        "network" : "Byzantium",
         "postState" : {
-            "0x0000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x0000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x0000000000000000000000000000000000000003" : {
+            "0x00000000000000000000000000000000000000f0" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -95,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5e1be",
+                "balance" : "0x4563918244f4bcc6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x02f90e5e",
+                "balance" : "0x02fa3356",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -126,10 +112,10 @@
             }
         }
     },
-    "TestCryptographicFunctions_d0g0v0_EIP158" : {
+    "TestCryptographicFunctions_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/stSolidityTest/TestCryptographicFunctions_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -141,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xbcc6",
-                    "hash" : "0x252e4990329d8c8d62e33fb7541bc0bed28e282bd8ba584744755b39e142185d",
-                    "mixHash" : "0xc46e6085778ce62ad6cc6f0dd6bd205cd72726b4fda59d2e3fb28d9d21bbd506",
-                    "nonce" : "0x526118390cd85215",
+                    "hash" : "0x6f7e638223ff47570d1ec7aa90eb7e171201103074ab86bf73a1b34c5d157f66",
+                    "mixHash" : "0x9d2e9117c287e9624f0bf0bdfd49b54f85b64d3e8804016f0b3a24dc423ecdd3",
+                    "nonce" : "0xecc0eda4151c8a58",
                     "number" : "0x01",
                     "parentHash" : "0xdf31f26e5dcb7e53609af62d501fdbab0b9eb2028bf9032eb0ac6ca23931102b",
-                    "receiptTrie" : "0x29ccfe7ebdc66ffbb28b90bdaaffb3edbf1c7aafd1ff3e856f0414872ec06e6f",
-                    "stateRoot" : "0xec96ca4ac3eea148dd4d254b21133c64a49851f6ff4e7d9c60fed7c6aacf8339",
+                    "receiptTrie" : "0x039ed60098a818a86bcb28efb76238766651e106559da0a6d1c5e29aa5e61621",
+                    "stateRoot" : "0xde924411d2f2926460aabac9748c53427315f33c6db217c8973f21427401dac9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8434166e881be58d6b74fb77ff3332a435208864dfc1bb330b4ea7d6c526997f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90269f901fca0df31f26e5dcb7e53609af62d501fdbab0b9eb2028bf9032eb0ac6ca23931102ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec96ca4ac3eea148dd4d254b21133c64a49851f6ff4e7d9c60fed7c6aacf8339a08434166e881be58d6b74fb77ff3332a435208864dfc1bb330b4ea7d6c526997fa029ccfe7ebdc66ffbb28b90bdaaffb3edbf1c7aafd1ff3e856f0414872ec06e6fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bcc68203e880a0c46e6085778ce62ad6cc6f0dd6bd205cd72726b4fda59d2e3fb28d9d21bbd50688526118390cd85215f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba034e6c6b7a2fcc20a447bcdef520b713a01c8f74084738aa93e72b466eba8c24da06ad238d471308dfcc7eef68b089a9866d611825f5bedeea7952dbf69afb8c18fc0",
+                "rlp" : "0xf90269f901fca0df31f26e5dcb7e53609af62d501fdbab0b9eb2028bf9032eb0ac6ca23931102ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de924411d2f2926460aabac9748c53427315f33c6db217c8973f21427401dac9a08434166e881be58d6b74fb77ff3332a435208864dfc1bb330b4ea7d6c526997fa0039ed60098a818a86bcb28efb76238766651e106559da0a6d1c5e29aa5e61621b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bcc68203e880a09d2e9117c287e9624f0bf0bdfd49b54f85b64d3e8804016f0b3a24dc423ecdd388ecc0eda4151c8a58f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba034e6c6b7a2fcc20a447bcdef520b713a01c8f74084738aa93e72b466eba8c24da06ad238d471308dfcc7eef68b089a9866d611825f5bedeea7952dbf69afb8c18fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -189,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f2e3a9a359399f54acfe449ed11bae9cd52926dcdf6729f2c57aadbe3a0aa04ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x252e4990329d8c8d62e33fb7541bc0bed28e282bd8ba584744755b39e142185d",
-        "network" : "EIP158",
+        "lastblockhash" : "0x6f7e638223ff47570d1ec7aa90eb7e171201103074ab86bf73a1b34c5d157f66",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x018704",
                 "code" : "0x6000357c010000000000000000000000000000000000000000000000000000000090048063c04062261461003a578063e0a9fd281461004c57005b61004261005e565b8060005260206000f35b610054610099565b8060005260206000f35b6000610068610099565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff169050610096565b90565b60006001905080507f43c4b4524adb81e4e9a5c4648a98e9d320e3908ac5b6c889144b642cd08ae16d60010260407f74657374737472696e67000000000000000000000000000000000000000000008152600a016040900360402014156100ff57610108565b600090506102ec565b7f3c8727e019a42b444667a587b6001251becadabbb36bfed8087a92c18882d11160010260026020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a0160006000856161da5a03f161016b57005b50600051141561017a57610183565b600090506102ec565b73cd566972b5e50104011a92b59fa8e0b1234851ae6c010000000000000000000000000260036020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a0160006000856161da5a03f16101e657005b506000516c010000000000000000000000000214156102045761020d565b600090506102ec565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b60016020600060007f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c6001028152602001601c81526020017f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f60010281526020017feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549600102815260200160006000856161da5a03f16102bd57005b5060005173ffffffffffffffffffffffffffffffffffffffff1614156102e2576102eb565b600090506102ec565b5b9056",
@@ -232,10 +225,10 @@
             }
         }
     },
-    "TestCryptographicFunctions_d0g0v0_Frontier" : {
+    "TestCryptographicFunctions_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestCryptographicFunctions_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -246,19 +239,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x01d8d6",
-                    "hash" : "0x4f725759255de8ced28398c689a637bc566a4b730984555c39426a67fff4c34d",
-                    "mixHash" : "0x0c0751ff3504ae7e7a8e9688038cf3c4cea76cc57aa87c3d267f86fe362f71cc",
-                    "nonce" : "0x057536355a9d63dc",
+                    "gasUsed" : "0x01e1be",
+                    "hash" : "0xb47f81ddc7b8f86aef989bb640d35833c3875c1747fa44adad484dcec729069c",
+                    "mixHash" : "0x682770b280677f778f8313817b5bc0ee255d29af686f00cacc103c8e6aa886a7",
+                    "nonce" : "0x7bcf8b1f1e0cc37e",
                     "number" : "0x01",
                     "parentHash" : "0xdf31f26e5dcb7e53609af62d501fdbab0b9eb2028bf9032eb0ac6ca23931102b",
-                    "receiptTrie" : "0x42a3ad15c2bb475714cf0bccaedccba6c0ba46171e3566b0040312fc8847cc02",
-                    "stateRoot" : "0x2549960d70951c66bdf38805b38b187f53c9f7cefdba83a93bfb745fe10298d9",
+                    "receiptTrie" : "0x34d5b774fb8901a1d81fe8970eb2bf277341bc244415fa9a237a0c60faffd2d0",
+                    "stateRoot" : "0xe61717548182f12eb1664faaa7c82d3a77bad76268f9d2581365bf54e2812fe1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8434166e881be58d6b74fb77ff3332a435208864dfc1bb330b4ea7d6c526997f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0df31f26e5dcb7e53609af62d501fdbab0b9eb2028bf9032eb0ac6ca23931102ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02549960d70951c66bdf38805b38b187f53c9f7cefdba83a93bfb745fe10298d9a08434166e881be58d6b74fb77ff3332a435208864dfc1bb330b4ea7d6c526997fa042a3ad15c2bb475714cf0bccaedccba6c0ba46171e3566b0040312fc8847cc02b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301d8d68203e880a00c0751ff3504ae7e7a8e9688038cf3c4cea76cc57aa87c3d267f86fe362f71cc88057536355a9d63dcf867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba034e6c6b7a2fcc20a447bcdef520b713a01c8f74084738aa93e72b466eba8c24da06ad238d471308dfcc7eef68b089a9866d611825f5bedeea7952dbf69afb8c18fc0",
+                "rlp" : "0xf9026af901fda0df31f26e5dcb7e53609af62d501fdbab0b9eb2028bf9032eb0ac6ca23931102ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e61717548182f12eb1664faaa7c82d3a77bad76268f9d2581365bf54e2812fe1a08434166e881be58d6b74fb77ff3332a435208864dfc1bb330b4ea7d6c526997fa034d5b774fb8901a1d81fe8970eb2bf277341bc244415fa9a237a0c60faffd2d0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301e1be8203e880a0682770b280677f778f8313817b5bc0ee255d29af686f00cacc103c8e6aa886a7887bcf8b1f1e0cc37ef867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba034e6c6b7a2fcc20a447bcdef520b713a01c8f74084738aa93e72b466eba8c24da06ad238d471308dfcc7eef68b089a9866d611825f5bedeea7952dbf69afb8c18fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -295,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f2e3a9a359399f54acfe449ed11bae9cd52926dcdf6729f2c57aadbe3a0aa04ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4f725759255de8ced28398c689a637bc566a4b730984555c39426a67fff4c34d",
-        "network" : "Frontier",
+        "lastblockhash" : "0xb47f81ddc7b8f86aef989bb640d35833c3875c1747fa44adad484dcec729069c",
+        "network" : "EIP150",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -328,14 +321,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5d8d6",
+                "balance" : "0x4563918244f5e1be",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x02f91746",
+                "balance" : "0x02f90e5e",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -359,10 +352,116 @@
             }
         }
     },
-    "TestCryptographicFunctions_d0g0v0_Homestead" : {
+    "TestCryptographicFunctions_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestCryptographicFunctions_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0xbcc6",
+                    "hash" : "0x5edb67040b4c4f16be0ccf47b6d118787c5e4f01d307f1f75e6f8bb9db77e95d",
+                    "mixHash" : "0xaa735de326a5399b113ea28e12c4de7041bfd5de739b06f66d3693d14bb16841",
+                    "nonce" : "0x5fb13b69eb5b61e5",
+                    "number" : "0x01",
+                    "parentHash" : "0xdf31f26e5dcb7e53609af62d501fdbab0b9eb2028bf9032eb0ac6ca23931102b",
+                    "receiptTrie" : "0x29ccfe7ebdc66ffbb28b90bdaaffb3edbf1c7aafd1ff3e856f0414872ec06e6f",
+                    "stateRoot" : "0xec96ca4ac3eea148dd4d254b21133c64a49851f6ff4e7d9c60fed7c6aacf8339",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8434166e881be58d6b74fb77ff3332a435208864dfc1bb330b4ea7d6c526997f",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90269f901fca0df31f26e5dcb7e53609af62d501fdbab0b9eb2028bf9032eb0ac6ca23931102ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec96ca4ac3eea148dd4d254b21133c64a49851f6ff4e7d9c60fed7c6aacf8339a08434166e881be58d6b74fb77ff3332a435208864dfc1bb330b4ea7d6c526997fa029ccfe7ebdc66ffbb28b90bdaaffb3edbf1c7aafd1ff3e856f0414872ec06e6fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bcc68203e880a0aa735de326a5399b113ea28e12c4de7041bfd5de739b06f66d3693d14bb16841885fb13b69eb5b61e5f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba034e6c6b7a2fcc20a447bcdef520b713a01c8f74084738aa93e72b466eba8c24da06ad238d471308dfcc7eef68b089a9866d611825f5bedeea7952dbf69afb8c18fc0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x02160ec0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x34e6c6b7a2fcc20a447bcdef520b713a01c8f74084738aa93e72b466eba8c24d",
+                        "s" : "0x6ad238d471308dfcc7eef68b089a9866d611825f5bedeea7952dbf69afb8c18f",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x64"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0xdf31f26e5dcb7e53609af62d501fdbab0b9eb2028bf9032eb0ac6ca23931102b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf2e3a9a359399f54acfe449ed11bae9cd52926dcdf6729f2c57aadbe3a0aa04e",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f2e3a9a359399f54acfe449ed11bae9cd52926dcdf6729f2c57aadbe3a0aa04ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5edb67040b4c4f16be0ccf47b6d118787c5e4f01d307f1f75e6f8bb9db77e95d",
+        "network" : "EIP158",
+        "postState" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x018704",
+                "code" : "0x6000357c010000000000000000000000000000000000000000000000000000000090048063c04062261461003a578063e0a9fd281461004c57005b61004261005e565b8060005260206000f35b610054610099565b8060005260206000f35b6000610068610099565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff169050610096565b90565b60006001905080507f43c4b4524adb81e4e9a5c4648a98e9d320e3908ac5b6c889144b642cd08ae16d60010260407f74657374737472696e67000000000000000000000000000000000000000000008152600a016040900360402014156100ff57610108565b600090506102ec565b7f3c8727e019a42b444667a587b6001251becadabbb36bfed8087a92c18882d11160010260026020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a0160006000856161da5a03f161016b57005b50600051141561017a57610183565b600090506102ec565b73cd566972b5e50104011a92b59fa8e0b1234851ae6c010000000000000000000000000260036020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a0160006000856161da5a03f16101e657005b506000516c010000000000000000000000000214156102045761020d565b600090506102ec565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b60016020600060007f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c6001028152602001601c81526020017f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f60010281526020017feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549600102815260200160006000856161da5a03f16102bd57005b5060005173ffffffffffffffffffffffffffffffffffffffff1614156102e2576102eb565b600090506102ec565b5b9056",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4bcc6",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x02fa3356",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6000357c010000000000000000000000000000000000000000000000000000000090048063c04062261461003a578063e0a9fd281461004c57005b61004261005e565b8060005260206000f35b610054610099565b8060005260206000f35b6000610068610099565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff169050610096565b90565b60006001905080507f43c4b4524adb81e4e9a5c4648a98e9d320e3908ac5b6c889144b642cd08ae16d60010260407f74657374737472696e67000000000000000000000000000000000000000000008152600a016040900360402014156100ff57610108565b600090506102ec565b7f3c8727e019a42b444667a587b6001251becadabbb36bfed8087a92c18882d11160010260026020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a0160006000856161da5a03f161016b57005b50600051141561017a57610183565b600090506102ec565b73cd566972b5e50104011a92b59fa8e0b1234851ae6c010000000000000000000000000260036020600060007f74657374737472696e67000000000000000000000000000000000000000000008152600a0160006000856161da5a03f16101e657005b506000516c010000000000000000000000000214156102045761020d565b600090506102ec565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b60016020600060007f18c547e4f7b0f325ad1e56f57e26c745b09a3e503d86e00e5255ff7f715d3d1c6001028152602001601c81526020017f73b1693892219d736caba55bdb67216e485557ea6b6af75f37096c9aa6a5a75f60010281526020017feeb940b1d03b21e36b0e47e79769f095fe2ab855bd91e3a38756b7d75a9c4549600102815260200160006000856161da5a03f16102bd57005b5060005173ffffffffffffffffffffffffffffffffffffffff1614156102e2576102eb565b600090506102ec565b5b9056",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x02faf080",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "TestCryptographicFunctions_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestCryptographicFunctions_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -374,9 +473,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x01d8d6",
-                    "hash" : "0xd31ace5db929253f9d68b1fb6011eef3e2f8ed9eb5f9d44bfadde16515f47188",
-                    "mixHash" : "0x5f988061618b9c7e6138cfeac4bfdbf1175b8b7dfff6623eb0ebd82c558d6b52",
-                    "nonce" : "0xca2a7e789774a768",
+                    "hash" : "0x51e4cbd902f9d36d4538734106b00bb357c6cf5c2ab0672b6c403bfc2bdccf64",
+                    "mixHash" : "0x198b63a0f8e10ee4aaf76993592e7a91e9821af4b9d27d7149886912e740fa1c",
+                    "nonce" : "0x1a3190cd3fa39691",
                     "number" : "0x01",
                     "parentHash" : "0xdf31f26e5dcb7e53609af62d501fdbab0b9eb2028bf9032eb0ac6ca23931102b",
                     "receiptTrie" : "0x42a3ad15c2bb475714cf0bccaedccba6c0ba46171e3566b0040312fc8847cc02",
@@ -385,7 +484,7 @@
                     "transactionsTrie" : "0x8434166e881be58d6b74fb77ff3332a435208864dfc1bb330b4ea7d6c526997f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0df31f26e5dcb7e53609af62d501fdbab0b9eb2028bf9032eb0ac6ca23931102ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02549960d70951c66bdf38805b38b187f53c9f7cefdba83a93bfb745fe10298d9a08434166e881be58d6b74fb77ff3332a435208864dfc1bb330b4ea7d6c526997fa042a3ad15c2bb475714cf0bccaedccba6c0ba46171e3566b0040312fc8847cc02b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301d8d68203e880a05f988061618b9c7e6138cfeac4bfdbf1175b8b7dfff6623eb0ebd82c558d6b5288ca2a7e789774a768f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba034e6c6b7a2fcc20a447bcdef520b713a01c8f74084738aa93e72b466eba8c24da06ad238d471308dfcc7eef68b089a9866d611825f5bedeea7952dbf69afb8c18fc0",
+                "rlp" : "0xf9026af901fda0df31f26e5dcb7e53609af62d501fdbab0b9eb2028bf9032eb0ac6ca23931102ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02549960d70951c66bdf38805b38b187f53c9f7cefdba83a93bfb745fe10298d9a08434166e881be58d6b74fb77ff3332a435208864dfc1bb330b4ea7d6c526997fa042a3ad15c2bb475714cf0bccaedccba6c0ba46171e3566b0040312fc8847cc02b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301d8d68203e880a0198b63a0f8e10ee4aaf76993592e7a91e9821af4b9d27d7149886912e740fa1c881a3190cd3fa39691f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba034e6c6b7a2fcc20a447bcdef520b713a01c8f74084738aa93e72b466eba8c24da06ad238d471308dfcc7eef68b089a9866d611825f5bedeea7952dbf69afb8c18fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -422,8 +521,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f2e3a9a359399f54acfe449ed11bae9cd52926dcdf6729f2c57aadbe3a0aa04ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd31ace5db929253f9d68b1fb6011eef3e2f8ed9eb5f9d44bfadde16515f47188",
-        "network" : "Homestead",
+        "lastblockhash" : "0x51e4cbd902f9d36d4538734106b00bb357c6cf5c2ab0672b6c403bfc2bdccf64",
+        "network" : "Frontier",
         "postState" : {
             "0x0000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
@@ -486,10 +585,10 @@
             }
         }
     },
-    "TestCryptographicFunctions_d0g0v0_Metropolis" : {
+    "TestCryptographicFunctions_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/stSolidityTest/TestCryptographicFunctions_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -500,19 +599,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xbcc6",
-                    "hash" : "0x6efde4fc940addd50710390013d911cc7097e7513fbd8b81f457caed54a0459e",
-                    "mixHash" : "0xa08eb0ad1e8b7804743c0c2d1f579254659caa792ba535044a640798f2e438bd",
-                    "nonce" : "0x62b2011c993e3017",
+                    "gasUsed" : "0x01d8d6",
+                    "hash" : "0xe9898c2408b91bd37be2ea8c211a66d739c5d40130ff92ace530ab771e4bcba6",
+                    "mixHash" : "0x6f21144a6ecb80061484df0175b95f846d250182716fd8be12b461a754a0c891",
+                    "nonce" : "0xca7ccbfd8d7cb21d",
                     "number" : "0x01",
                     "parentHash" : "0xdf31f26e5dcb7e53609af62d501fdbab0b9eb2028bf9032eb0ac6ca23931102b",
-                    "receiptTrie" : "0x039ed60098a818a86bcb28efb76238766651e106559da0a6d1c5e29aa5e61621",
-                    "stateRoot" : "0xde924411d2f2926460aabac9748c53427315f33c6db217c8973f21427401dac9",
+                    "receiptTrie" : "0x42a3ad15c2bb475714cf0bccaedccba6c0ba46171e3566b0040312fc8847cc02",
+                    "stateRoot" : "0x2549960d70951c66bdf38805b38b187f53c9f7cefdba83a93bfb745fe10298d9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8434166e881be58d6b74fb77ff3332a435208864dfc1bb330b4ea7d6c526997f",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90269f901fca0df31f26e5dcb7e53609af62d501fdbab0b9eb2028bf9032eb0ac6ca23931102ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de924411d2f2926460aabac9748c53427315f33c6db217c8973f21427401dac9a08434166e881be58d6b74fb77ff3332a435208864dfc1bb330b4ea7d6c526997fa0039ed60098a818a86bcb28efb76238766651e106559da0a6d1c5e29aa5e61621b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82bcc68203e880a0a08eb0ad1e8b7804743c0c2d1f579254659caa792ba535044a640798f2e438bd8862b2011c993e3017f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba034e6c6b7a2fcc20a447bcdef520b713a01c8f74084738aa93e72b466eba8c24da06ad238d471308dfcc7eef68b089a9866d611825f5bedeea7952dbf69afb8c18fc0",
+                "rlp" : "0xf9026af901fda0df31f26e5dcb7e53609af62d501fdbab0b9eb2028bf9032eb0ac6ca23931102ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02549960d70951c66bdf38805b38b187f53c9f7cefdba83a93bfb745fe10298d9a08434166e881be58d6b74fb77ff3332a435208864dfc1bb330b4ea7d6c526997fa042a3ad15c2bb475714cf0bccaedccba6c0ba46171e3566b0040312fc8847cc02b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8301d8d68203e880a06f21144a6ecb80061484df0175b95f846d250182716fd8be12b461a754a0c89188ca7ccbfd8d7cb21df867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba034e6c6b7a2fcc20a447bcdef520b713a01c8f74084738aa93e72b466eba8c24da06ad238d471308dfcc7eef68b089a9866d611825f5bedeea7952dbf69afb8c18fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -549,10 +648,24 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f2e3a9a359399f54acfe449ed11bae9cd52926dcdf6729f2c57aadbe3a0aa04ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6efde4fc940addd50710390013d911cc7097e7513fbd8b81f457caed54a0459e",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe9898c2408b91bd37be2ea8c211a66d739c5d40130ff92ace530ab771e4bcba6",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
+            "0x0000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x0000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "",
                 "nonce" : "0x00",
@@ -568,14 +681,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4bcc6",
+                "balance" : "0x4563918244f5d8d6",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x02fa3356",
+                "balance" : "0x02f91746",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stSolidityTest/TestKeywords_d0g0v0.json b/BlockchainTests/GeneralStateTests/stSolidityTest/TestKeywords_d0g0v0.json
index af7badf60..9806dd688 100644
--- a/BlockchainTests/GeneralStateTests/stSolidityTest/TestKeywords_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stSolidityTest/TestKeywords_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "TestKeywords_d0g0v0_EIP150" : {
+    "TestKeywords_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestKeywords_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa8f4",
-                    "hash" : "0x26fb5b2f78ba1aa16e43d8a6f6fb2297e0fc459994e0a66cb5914733aab547c0",
-                    "mixHash" : "0x937cf89cbf60b3a6e491deb8370c8694bb338c073faf0ddce5498cd984981630",
-                    "nonce" : "0x9245fd3271c04d53",
+                    "hash" : "0xc080ce5bd8474ce0ab0067d9048c85926ebe7638d3ca952ed2ce46b51ee9689e",
+                    "mixHash" : "0x4c57a66b0a6f5869fabff343b06ecd1e29c1ca5786b968df23f1caa1227bed89",
+                    "nonce" : "0xc38e7edf4f7c2dfd",
                     "number" : "0x01",
                     "parentHash" : "0x648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469",
-                    "receiptTrie" : "0x81c07605011d3cbc790df4f31b2e6e630faf1bcea3c50b62089cb7e77c73253d",
-                    "stateRoot" : "0xbfaf39f42f28999d14d30725f2bfe0cb6a04624ff7a497e7d7daec7f54e59828",
+                    "receiptTrie" : "0x3e65e22ef08f4eaf9cd5b79570f355c600eb3e92128ede01ef260a63e8fd8318",
+                    "stateRoot" : "0xa93d24f71f53e5a19a7a293b1a7a2f974701c6f435a9785ecb20c95c4c408633",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a0648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bfaf39f42f28999d14d30725f2bfe0cb6a04624ff7a497e7d7daec7f54e59828a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a081c07605011d3cbc790df4f31b2e6e630faf1bcea3c50b62089cb7e77c73253db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a8f48203e880a0937cf89cbf60b3a6e491deb8370c8694bb338c073faf0ddce5498cd984981630889245fd3271c04d53f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "rlp" : "0xf90264f901f8a0648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a93d24f71f53e5a19a7a293b1a7a2f974701c6f435a9785ecb20c95c4c408633a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a03e65e22ef08f4eaf9cd5b79570f355c600eb3e92128ede01ef260a63e8fd8318b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a8f48203e880a04c57a66b0a6f5869fabff343b06ecd1e29c1ca5786b968df23f1caa1227bed8988c38e7edf4f7c2dfdf866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e466e2676020d7a701543c69b8d874b0bc13ce7a94baebd5b5e17b90017233d5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x26fb5b2f78ba1aa16e43d8a6f6fb2297e0fc459994e0a66cb5914733aab547c0",
-        "network" : "EIP150",
+        "lastblockhash" : "0xc080ce5bd8474ce0ab0067d9048c85926ebe7638d3ca952ed2ce46b51ee9689e",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463380e439681146037578063c040622614604757005b603d6084565b8060005260206000f35b604d6057565b8060005260206000f35b6000605f6084565b600060006101000a81548160ff0219169083021790555060ff60016000540416905090565b6000808160011560cd575b600a82121560a157600190910190608f565b81600a1460ac5760c9565b50600a5b60008160ff16111560c85760019182900391900360b0565b5b60d5565b6000925060ed565b8160001460e05760e8565b6001925060ed565b600092505b50509056",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "TestKeywords_d0g0v0_EIP158" : {
+    "TestKeywords_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/stSolidityTest/TestKeywords_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa8f4",
-                    "hash" : "0x1c36773107a7e86b0efad3672f460942248f9160f9da640499174638021184e5",
-                    "mixHash" : "0xf39e97b7476278ca99b8443ee6b33c50a83d69fbcf8cf786e790568983be67a9",
-                    "nonce" : "0xa504d5aab92c2731",
+                    "hash" : "0xa7deb0cb48863113a3b98a07fd61181e0bee37166d0ae9417494c446d6734d85",
+                    "mixHash" : "0x7c5e455d20a3c39959e805497c7753db356426d3916d27883393de605e32c7a5",
+                    "nonce" : "0x3e0a0b18e2c9d16c",
+                    "number" : "0x01",
+                    "parentHash" : "0x648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469",
+                    "receiptTrie" : "0x3e65e22ef08f4eaf9cd5b79570f355c600eb3e92128ede01ef260a63e8fd8318",
+                    "stateRoot" : "0xa93d24f71f53e5a19a7a293b1a7a2f974701c6f435a9785ecb20c95c4c408633",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90264f901f8a0648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a93d24f71f53e5a19a7a293b1a7a2f974701c6f435a9785ecb20c95c4c408633a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a03e65e22ef08f4eaf9cd5b79570f355c600eb3e92128ede01ef260a63e8fd8318b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a8f48203e880a07c5e455d20a3c39959e805497c7753db356426d3916d27883393de605e32c7a5883e0a0b18e2c9d16cf866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x055730",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xde52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5e",
+                        "s" : "0x76154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7f",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x01"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x05f5e100",
+            "gasUsed" : "0x00",
+            "hash" : "0x648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe466e2676020d7a701543c69b8d874b0bc13ce7a94baebd5b5e17b90017233d5",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e466e2676020d7a701543c69b8d874b0bc13ce7a94baebd5b5e17b90017233d5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa7deb0cb48863113a3b98a07fd61181e0bee37166d0ae9417494c446d6734d85",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a1",
+                "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463380e439681146037578063c040622614604757005b603d6084565b8060005260206000f35b604d6057565b8060005260206000f35b6000605f6084565b600060006101000a81548160ff0219169083021790555060ff60016000540416905090565b6000808160011560cd575b600a82121560a157600190910190608f565b81600a1460ac5760c9565b50600a5b60008160ff16111560c85760019182900391900360b0565b5b60d5565b6000925060ed565b8160001460e05760e8565b6001925060ed565b600092505b50509056",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4a8f4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0e994b",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463380e439681146037578063c040622614604757005b603d6084565b8060005260206000f35b604d6057565b8060005260206000f35b6000605f6084565b600060006101000a81548160ff0219169083021790555060ff60016000540416905090565b6000808160011560cd575b600a82121560a157600190910190608f565b81600a1460ac5760c9565b50600a5b60008160ff16111560c85760019182900391900360b0565b5b60d5565b6000925060ed565b8160001460e05760e8565b6001925060ed565b600092505b50509056",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "TestKeywords_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestKeywords_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x05f5e100",
+                    "gasUsed" : "0xa8f4",
+                    "hash" : "0xd37f8ea8a3f17f936579932e841f4468393b958841b6ad925fa34afbe3873246",
+                    "mixHash" : "0x8dcc4a14d6435e8533f0e4bcdf69540a240bd4b3c51dd949616c05ea42a78234",
+                    "nonce" : "0x6083ab55acda6348",
                     "number" : "0x01",
                     "parentHash" : "0x648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469",
                     "receiptTrie" : "0x81c07605011d3cbc790df4f31b2e6e630faf1bcea3c50b62089cb7e77c73253d",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a0648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bfaf39f42f28999d14d30725f2bfe0cb6a04624ff7a497e7d7daec7f54e59828a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a081c07605011d3cbc790df4f31b2e6e630faf1bcea3c50b62089cb7e77c73253db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a8f48203e880a0f39e97b7476278ca99b8443ee6b33c50a83d69fbcf8cf786e790568983be67a988a504d5aab92c2731f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "rlp" : "0xf90264f901f8a0648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bfaf39f42f28999d14d30725f2bfe0cb6a04624ff7a497e7d7daec7f54e59828a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a081c07605011d3cbc790df4f31b2e6e630faf1bcea3c50b62089cb7e77c73253db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a8f48203e880a08dcc4a14d6435e8533f0e4bcdf69540a240bd4b3c51dd949616c05ea42a78234886083ab55acda6348f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e466e2676020d7a701543c69b8d874b0bc13ce7a94baebd5b5e17b90017233d5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1c36773107a7e86b0efad3672f460942248f9160f9da640499174638021184e5",
-        "network" : "EIP158",
+        "lastblockhash" : "0xd37f8ea8a3f17f936579932e841f4468393b958841b6ad925fa34afbe3873246",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "TestKeywords_d0g0v0_Frontier" : {
+    "TestKeywords_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestKeywords_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xa7c8",
-                    "hash" : "0x5423107ba829546dc598582a6ba56e12c11c59820660a0d371a26bf460e482e2",
-                    "mixHash" : "0xbbc0381bba72ee45836c9c073533dae4cc76fe25944372b1d55f74ecaba7115c",
-                    "nonce" : "0x3af8d9dff97ace10",
+                    "gasUsed" : "0xa8f4",
+                    "hash" : "0xd12b696e45dee8074f7500256c149c50b2b1c7d8f3c4af3b3f729b57fed80434",
+                    "mixHash" : "0xd0384d90b691edb1ff6f57517507f73512a6d253cf00b9fc0d8e2f43752bddd1",
+                    "nonce" : "0xdd71d3f8cab99489",
                     "number" : "0x01",
                     "parentHash" : "0x648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469",
-                    "receiptTrie" : "0xfee2cb8c889025ff39b242edbd71f685ba591d1b689ae1b7a4916b19ab430f67",
-                    "stateRoot" : "0x86c852f485c7e5977696a0a4e6e4cb0f6da59d6b5a0f11e9c82f1d1aaa9cad65",
+                    "receiptTrie" : "0x81c07605011d3cbc790df4f31b2e6e630faf1bcea3c50b62089cb7e77c73253d",
+                    "stateRoot" : "0xbfaf39f42f28999d14d30725f2bfe0cb6a04624ff7a497e7d7daec7f54e59828",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a0648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086c852f485c7e5977696a0a4e6e4cb0f6da59d6b5a0f11e9c82f1d1aaa9cad65a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0fee2cb8c889025ff39b242edbd71f685ba591d1b689ae1b7a4916b19ab430f67b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7c88203e880a0bbc0381bba72ee45836c9c073533dae4cc76fe25944372b1d55f74ecaba7115c883af8d9dff97ace10f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "rlp" : "0xf90264f901f8a0648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bfaf39f42f28999d14d30725f2bfe0cb6a04624ff7a497e7d7daec7f54e59828a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a081c07605011d3cbc790df4f31b2e6e630faf1bcea3c50b62089cb7e77c73253db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a8f48203e880a0d0384d90b691edb1ff6f57517507f73512a6d253cf00b9fc0d8e2f43752bddd188dd71d3f8cab99489f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -274,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e466e2676020d7a701543c69b8d874b0bc13ce7a94baebd5b5e17b90017233d5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5423107ba829546dc598582a6ba56e12c11c59820660a0d371a26bf460e482e2",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd12b696e45dee8074f7500256c149c50b2b1c7d8f3c4af3b3f729b57fed80434",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
@@ -286,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a7c8",
+                "balance" : "0x4563918244f4a8f4",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0e9a77",
+                "balance" : "0x0e994b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +437,10 @@
             }
         }
     },
-    "TestKeywords_d0g0v0_Homestead" : {
+    "TestKeywords_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestKeywords_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
                     "gasUsed" : "0xa7c8",
-                    "hash" : "0xbc4d7b21f4af354bd538341585f7ea7af9eccf6c7882921d80ddb06661b2dc23",
-                    "mixHash" : "0x16719bcf689ed23cc9e2919f8902c2f9ab3a6771a1b4ff16fdc0419e6f57c6e4",
-                    "nonce" : "0xfbdeebd073847b5e",
+                    "hash" : "0xa4318da6b850bfcf2df654d05a1f0276cca05c30183d97a0deeb84115daab084",
+                    "mixHash" : "0xa07aa07a2ccbc53a061905141c6d13f98a4e82280e7f20910d01154cbe9e805f",
+                    "nonce" : "0x16ffacb41bcf443b",
                     "number" : "0x01",
                     "parentHash" : "0x648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469",
                     "receiptTrie" : "0xfee2cb8c889025ff39b242edbd71f685ba591d1b689ae1b7a4916b19ab430f67",
@@ -343,7 +463,7 @@
                     "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a0648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086c852f485c7e5977696a0a4e6e4cb0f6da59d6b5a0f11e9c82f1d1aaa9cad65a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0fee2cb8c889025ff39b242edbd71f685ba591d1b689ae1b7a4916b19ab430f67b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7c88203e880a016719bcf689ed23cc9e2919f8902c2f9ab3a6771a1b4ff16fdc0419e6f57c6e488fbdeebd073847b5ef866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "rlp" : "0xf90264f901f8a0648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086c852f485c7e5977696a0a4e6e4cb0f6da59d6b5a0f11e9c82f1d1aaa9cad65a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0fee2cb8c889025ff39b242edbd71f685ba591d1b689ae1b7a4916b19ab430f67b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7c88203e880a0a07aa07a2ccbc53a061905141c6d13f98a4e82280e7f20910d01154cbe9e805f8816ffacb41bcf443bf866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -380,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e466e2676020d7a701543c69b8d874b0bc13ce7a94baebd5b5e17b90017233d5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbc4d7b21f4af354bd538341585f7ea7af9eccf6c7882921d80ddb06661b2dc23",
-        "network" : "Homestead",
+        "lastblockhash" : "0xa4318da6b850bfcf2df654d05a1f0276cca05c30183d97a0deeb84115daab084",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
@@ -423,10 +543,10 @@
             }
         }
     },
-    "TestKeywords_d0g0v0_Metropolis" : {
+    "TestKeywords_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/stSolidityTest/TestKeywords_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +557,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x05f5e100",
-                    "gasUsed" : "0xa8f4",
-                    "hash" : "0xa2cf4f9b1f3cb4ce56f979a1fdbe9c1c111491069eb61673222e4052d7fb4c9b",
-                    "mixHash" : "0xa8399ef234510990c40caa7659e72a14e1ac249bf00dec4c1bcf96b365c0171d",
-                    "nonce" : "0xd06830d2b8ed6405",
+                    "gasUsed" : "0xa7c8",
+                    "hash" : "0xff64fcc06c7ba1433d07ed0933e739582e18542e27f6ff50f9a947421130b592",
+                    "mixHash" : "0x6a13e3a164969f5af1f3fc02dc71d2c15493109af2bf2cb9a469a76a70c484d7",
+                    "nonce" : "0x34c98fef3f2116a0",
                     "number" : "0x01",
                     "parentHash" : "0x648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469",
-                    "receiptTrie" : "0x3e65e22ef08f4eaf9cd5b79570f355c600eb3e92128ede01ef260a63e8fd8318",
-                    "stateRoot" : "0xa93d24f71f53e5a19a7a293b1a7a2f974701c6f435a9785ecb20c95c4c408633",
+                    "receiptTrie" : "0xfee2cb8c889025ff39b242edbd71f685ba591d1b689ae1b7a4916b19ab430f67",
+                    "stateRoot" : "0x86c852f485c7e5977696a0a4e6e4cb0f6da59d6b5a0f11e9c82f1d1aaa9cad65",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f8a0648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a93d24f71f53e5a19a7a293b1a7a2f974701c6f435a9785ecb20c95c4c408633a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a03e65e22ef08f4eaf9cd5b79570f355c600eb3e92128ede01ef260a63e8fd8318b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a8f48203e880a0a8399ef234510990c40caa7659e72a14e1ac249bf00dec4c1bcf96b365c0171d88d06830d2b8ed6405f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
+                "rlp" : "0xf90264f901f8a0648c64a1546602a85a8bd44bf8015020f1776c58b54cd5916b7b9908cdc28469a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086c852f485c7e5977696a0a4e6e4cb0f6da59d6b5a0f11e9c82f1d1aaa9cad65a0758e126e5308d1ef59b0be3487c5cd860b33d0b7ebde2ecb38b45cde05f5cbc1a0fee2cb8c889025ff39b242edbd71f685ba591d1b689ae1b7a4916b19ab430f67b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018405f5e10082a7c88203e880a06a13e3a164969f5af1f3fc02dc71d2c15493109af2bf2cb9a469a76a70c484d78834c98fef3f2116a0f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d870184c04062261ba0de52c10f466ca9a09c552f9669cf780cae9466caf4389d9196863b9ad1609d5ea076154d3c182d7b93f161add2125a73a0ba33ca816963930e51e1e7ee67d3bd7fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -486,16 +606,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e466e2676020d7a701543c69b8d874b0bc13ce7a94baebd5b5e17b90017233d5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808405f5e100808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa2cf4f9b1f3cb4ce56f979a1fdbe9c1c111491069eb61673222e4052d7fb4c9b",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xff64fcc06c7ba1433d07ed0933e739582e18542e27f6ff50f9a947421130b592",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a1",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463380e439681146037578063c040622614604757005b603d6084565b8060005260206000f35b604d6057565b8060005260206000f35b6000605f6084565b600060006101000a81548160ff0219169083021790555060ff60016000540416905090565b6000808160011560cd575b600a82121560a157600190910190608f565b81600a1460ac5760c9565b50600a5b60008160ff16111560c85760019182900391900360b0565b5b60d5565b6000925060ed565b8160001460e05760e8565b6001925060ed565b600092505b50509056",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a8f4",
+                "balance" : "0x4563918244f4a7c8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0e994b",
+                "balance" : "0x0e9a77",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stSolidityTest/TestOverflow_d0g0v0.json b/BlockchainTests/GeneralStateTests/stSolidityTest/TestOverflow_d0g0v0.json
index 81e72c404..51ce5c6f2 100644
--- a/BlockchainTests/GeneralStateTests/stSolidityTest/TestOverflow_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stSolidityTest/TestOverflow_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "TestOverflow_d0g0v0_EIP150" : {
+    "TestOverflow_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestOverflow_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa488",
-                    "hash" : "0x032eaa5008921de11596da830cdb4814b37bbcdaa59fe5384fd3647c573e97b2",
-                    "mixHash" : "0xb2e3c803554263a52a9ae61adb1fe4846181bddbe11083e3ee80ec4fcc5322c5",
-                    "nonce" : "0x8e9a402427a46327",
+                    "hash" : "0xad7aaf2d351d2e61e128068e7d665a3b466afb0502c31aa57171d73be81ef104",
+                    "mixHash" : "0xc15eebcb5fde057c0ae4c23b1b25008825ed108f1c884cae60a44c1c1cd947be",
+                    "nonce" : "0x390c4fe3864c5ab8",
                     "number" : "0x01",
                     "parentHash" : "0xdca5b3cbe8cf7e5c715a7023c26a294625272e421b09cc81efc21b65b29e1d8e",
-                    "receiptTrie" : "0xe271abb36f38f77c75fa745a89a68ff12dd0f0bc4fde2dc9bc01184cf744c7fe",
-                    "stateRoot" : "0x21d5d723a1afa180e5eac960303e32e825a07cfae8800ee92353462b12591f1e",
+                    "receiptTrie" : "0xda94f1a89f6c4d10fd8fc7cf9b42c31508d676e690fcf6e74a2c92517cdbc275",
+                    "stateRoot" : "0x4b66fde083e410ae8281007421c9cb7a5d01a55ac93107f120c7575de0a7c211",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90269f901fca0dca5b3cbe8cf7e5c715a7023c26a294625272e421b09cc81efc21b65b29e1d8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021d5d723a1afa180e5eac960303e32e825a07cfae8800ee92353462b12591f1ea07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0e271abb36f38f77c75fa745a89a68ff12dd0f0bc4fde2dc9bc01184cf744c7feb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4888203e880a0b2e3c803554263a52a9ae61adb1fe4846181bddbe11083e3ee80ec4fcc5322c5888e9a402427a46327f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
+                "rlp" : "0xf90269f901fca0dca5b3cbe8cf7e5c715a7023c26a294625272e421b09cc81efc21b65b29e1d8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b66fde083e410ae8281007421c9cb7a5d01a55ac93107f120c7575de0a7c211a07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0da94f1a89f6c4d10fd8fc7cf9b42c31508d676e690fcf6e74a2c92517cdbc275b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4888203e880a0c15eebcb5fde057c0ae4c23b1b25008825ed108f1c884cae60a44c1c1cd947be88390c4fe3864c5ab8f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0406245bf6d5687082ad42d88d31628cf2a49427556d762ed794585451552d9a5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x032eaa5008921de11596da830cdb4814b37bbcdaa59fe5384fd3647c573e97b2",
-        "network" : "EIP150",
+        "lastblockhash" : "0xad7aaf2d351d2e61e128068e7d665a3b466afb0502c31aa57171d73be81ef104",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6000357c0100000000000000000000000000000000000000000000000000000000900480638040cac41461003a578063c04062261461004c57005b610042610099565b8060005260206000f35b61005461005e565b8060005260206000f35b6000610068610099565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff169050610096565b90565b60006000600060006001935083507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff925060006001840114156100db576100e4565b6000935061013b565b63ffffffff915060006001830163ffffffff1614156101025761010b565b6000935061013b565b67ffffffffffffffff905060006001820167ffffffffffffffff1614156101315761013a565b6000935061013b565b5b5050509056",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "TestOverflow_d0g0v0_EIP158" : {
+    "TestOverflow_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/stSolidityTest/TestOverflow_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa488",
-                    "hash" : "0x3eb6dc661addaf6af657edbc89b8b5f464033e74cf5e70bd859d827fae25320f",
-                    "mixHash" : "0x2358ce47e5de481867de7910cf8357f4b31a19633bc2a253171995d059abceb6",
-                    "nonce" : "0xa6c579ae49bb4301",
+                    "hash" : "0x3b9e8b878963718a83f286173bda50c20f2cf5afbd73acef9058b4ffe2409111",
+                    "mixHash" : "0xbb9c02db38875f4379406b07bc3b20f8ef1af63cd07db34bcf135f8c6a0275aa",
+                    "nonce" : "0x0e7376a9a2265298",
+                    "number" : "0x01",
+                    "parentHash" : "0xdca5b3cbe8cf7e5c715a7023c26a294625272e421b09cc81efc21b65b29e1d8e",
+                    "receiptTrie" : "0xda94f1a89f6c4d10fd8fc7cf9b42c31508d676e690fcf6e74a2c92517cdbc275",
+                    "stateRoot" : "0x4b66fde083e410ae8281007421c9cb7a5d01a55ac93107f120c7575de0a7c211",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90269f901fca0dca5b3cbe8cf7e5c715a7023c26a294625272e421b09cc81efc21b65b29e1d8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b66fde083e410ae8281007421c9cb7a5d01a55ac93107f120c7575de0a7c211a07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0da94f1a89f6c4d10fd8fc7cf9b42c31508d676e690fcf6e74a2c92517cdbc275b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4888203e880a0bb9c02db38875f4379406b07bc3b20f8ef1af63cd07db34bcf135f8c6a0275aa880e7376a9a2265298f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x02160ec0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fe",
+                        "s" : "0x479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0xdca5b3cbe8cf7e5c715a7023c26a294625272e421b09cc81efc21b65b29e1d8e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x406245bf6d5687082ad42d88d31628cf2a49427556d762ed794585451552d9a5",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0406245bf6d5687082ad42d88d31628cf2a49427556d762ed794585451552d9a5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3b9e8b878963718a83f286173bda50c20f2cf5afbd73acef9058b4ffe2409111",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6000357c0100000000000000000000000000000000000000000000000000000000900480638040cac41461003a578063c04062261461004c57005b610042610099565b8060005260206000f35b61005461005e565b8060005260206000f35b6000610068610099565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff169050610096565b90565b60006000600060006001935083507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff925060006001840114156100db576100e4565b6000935061013b565b63ffffffff915060006001830163ffffffff1614156101025761010b565b6000935061013b565b67ffffffffffffffff905060006001820167ffffffffffffffff1614156101315761013a565b6000935061013b565b5b5050509056",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4a488",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x02fa4bf8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6000357c0100000000000000000000000000000000000000000000000000000000900480638040cac41461003a578063c04062261461004c57005b610042610099565b8060005260206000f35b61005461005e565b8060005260206000f35b6000610068610099565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff169050610096565b90565b60006000600060006001935083507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff925060006001840114156100db576100e4565b6000935061013b565b63ffffffff915060006001830163ffffffff1614156101025761010b565b6000935061013b565b67ffffffffffffffff905060006001820167ffffffffffffffff1614156101315761013a565b6000935061013b565b5b5050509056",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x02faf080",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "TestOverflow_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestOverflow_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0xa488",
+                    "hash" : "0x01ed74cc706a0057f2748ec4996307fc2f0eb433a961680a9c1db49275154eca",
+                    "mixHash" : "0x80696294197a3a9502a905143b8673cb9ebbe62e7e2c7f37aa3262abecaf2673",
+                    "nonce" : "0xbfc4e1f6c3b1220b",
                     "number" : "0x01",
                     "parentHash" : "0xdca5b3cbe8cf7e5c715a7023c26a294625272e421b09cc81efc21b65b29e1d8e",
                     "receiptTrie" : "0xe271abb36f38f77c75fa745a89a68ff12dd0f0bc4fde2dc9bc01184cf744c7fe",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x7ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90269f901fca0dca5b3cbe8cf7e5c715a7023c26a294625272e421b09cc81efc21b65b29e1d8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021d5d723a1afa180e5eac960303e32e825a07cfae8800ee92353462b12591f1ea07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0e271abb36f38f77c75fa745a89a68ff12dd0f0bc4fde2dc9bc01184cf744c7feb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4888203e880a02358ce47e5de481867de7910cf8357f4b31a19633bc2a253171995d059abceb688a6c579ae49bb4301f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
+                "rlp" : "0xf90269f901fca0dca5b3cbe8cf7e5c715a7023c26a294625272e421b09cc81efc21b65b29e1d8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021d5d723a1afa180e5eac960303e32e825a07cfae8800ee92353462b12591f1ea07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0e271abb36f38f77c75fa745a89a68ff12dd0f0bc4fde2dc9bc01184cf744c7feb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4888203e880a080696294197a3a9502a905143b8673cb9ebbe62e7e2c7f37aa3262abecaf267388bfc4e1f6c3b1220bf867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0406245bf6d5687082ad42d88d31628cf2a49427556d762ed794585451552d9a5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3eb6dc661addaf6af657edbc89b8b5f464033e74cf5e70bd859d827fae25320f",
-        "network" : "EIP158",
+        "lastblockhash" : "0x01ed74cc706a0057f2748ec4996307fc2f0eb433a961680a9c1db49275154eca",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "TestOverflow_d0g0v0_Frontier" : {
+    "TestOverflow_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestOverflow_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xa35c",
-                    "hash" : "0x7d5b140e351b1a08736ecdd4054a4da3cf030170e71f6c546a94bb95fc7f46f7",
-                    "mixHash" : "0x3efd647149b890a4e1d05fa52b24da7afa45021cd57b512b9c9ba35b99f57e12",
-                    "nonce" : "0x469e0fbf2f132153",
+                    "gasUsed" : "0xa488",
+                    "hash" : "0x1f50b9a95c2391a1881c1ccb52d56a1764b6f8305943ba25fd7ed0b9703e7318",
+                    "mixHash" : "0x6b7b8f0f5d860d00f0cca064a3df49270af454018f868d30e609da13e866689d",
+                    "nonce" : "0x03f712fb906f6cb4",
                     "number" : "0x01",
                     "parentHash" : "0xdca5b3cbe8cf7e5c715a7023c26a294625272e421b09cc81efc21b65b29e1d8e",
-                    "receiptTrie" : "0x51fdce2a815c4f7c956f387a7d65b1a0275268e273e417d025c36a04285b7559",
-                    "stateRoot" : "0x6468d61b74a2a19b7b4ad19108d95b3dd5d278cb7767e349ba05fe2947a645f0",
+                    "receiptTrie" : "0xe271abb36f38f77c75fa745a89a68ff12dd0f0bc4fde2dc9bc01184cf744c7fe",
+                    "stateRoot" : "0x21d5d723a1afa180e5eac960303e32e825a07cfae8800ee92353462b12591f1e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90269f901fca0dca5b3cbe8cf7e5c715a7023c26a294625272e421b09cc81efc21b65b29e1d8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06468d61b74a2a19b7b4ad19108d95b3dd5d278cb7767e349ba05fe2947a645f0a07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a051fdce2a815c4f7c956f387a7d65b1a0275268e273e417d025c36a04285b7559b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a35c8203e880a03efd647149b890a4e1d05fa52b24da7afa45021cd57b512b9c9ba35b99f57e1288469e0fbf2f132153f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
+                "rlp" : "0xf90269f901fca0dca5b3cbe8cf7e5c715a7023c26a294625272e421b09cc81efc21b65b29e1d8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021d5d723a1afa180e5eac960303e32e825a07cfae8800ee92353462b12591f1ea07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0e271abb36f38f77c75fa745a89a68ff12dd0f0bc4fde2dc9bc01184cf744c7feb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4888203e880a06b7b8f0f5d860d00f0cca064a3df49270af454018f868d30e609da13e866689d8803f712fb906f6cb4f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -274,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0406245bf6d5687082ad42d88d31628cf2a49427556d762ed794585451552d9a5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7d5b140e351b1a08736ecdd4054a4da3cf030170e71f6c546a94bb95fc7f46f7",
-        "network" : "Frontier",
+        "lastblockhash" : "0x1f50b9a95c2391a1881c1ccb52d56a1764b6f8305943ba25fd7ed0b9703e7318",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
@@ -286,14 +406,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a35c",
+                "balance" : "0x4563918244f4a488",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x02fa4d24",
+                "balance" : "0x02fa4bf8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +437,10 @@
             }
         }
     },
-    "TestOverflow_d0g0v0_Homestead" : {
+    "TestOverflow_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestOverflow_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa35c",
-                    "hash" : "0x9a3872fa68677d428421a555080c68c1789fd18d2807a14bdf830327fbb060ce",
-                    "mixHash" : "0xe83537a5f3b7ca41ade849481cb365f3057b4d094b1e0df02c4869c5eb63697a",
-                    "nonce" : "0x780749b60ade4de9",
+                    "hash" : "0x9ea1c1c752923547198a9a0e59e5a2b3dca196afd0816224ae72b587017dc3b2",
+                    "mixHash" : "0xead269058e1a90462b83cebae6ed14db61c4d705538166d4a2ef3666bfbf6c43",
+                    "nonce" : "0x84a2378cac5497f1",
                     "number" : "0x01",
                     "parentHash" : "0xdca5b3cbe8cf7e5c715a7023c26a294625272e421b09cc81efc21b65b29e1d8e",
                     "receiptTrie" : "0x51fdce2a815c4f7c956f387a7d65b1a0275268e273e417d025c36a04285b7559",
@@ -343,7 +463,7 @@
                     "transactionsTrie" : "0x7ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90269f901fca0dca5b3cbe8cf7e5c715a7023c26a294625272e421b09cc81efc21b65b29e1d8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06468d61b74a2a19b7b4ad19108d95b3dd5d278cb7767e349ba05fe2947a645f0a07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a051fdce2a815c4f7c956f387a7d65b1a0275268e273e417d025c36a04285b7559b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a35c8203e880a0e83537a5f3b7ca41ade849481cb365f3057b4d094b1e0df02c4869c5eb63697a88780749b60ade4de9f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
+                "rlp" : "0xf90269f901fca0dca5b3cbe8cf7e5c715a7023c26a294625272e421b09cc81efc21b65b29e1d8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06468d61b74a2a19b7b4ad19108d95b3dd5d278cb7767e349ba05fe2947a645f0a07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a051fdce2a815c4f7c956f387a7d65b1a0275268e273e417d025c36a04285b7559b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a35c8203e880a0ead269058e1a90462b83cebae6ed14db61c4d705538166d4a2ef3666bfbf6c438884a2378cac5497f1f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -380,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0406245bf6d5687082ad42d88d31628cf2a49427556d762ed794585451552d9a5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9a3872fa68677d428421a555080c68c1789fd18d2807a14bdf830327fbb060ce",
-        "network" : "Homestead",
+        "lastblockhash" : "0x9ea1c1c752923547198a9a0e59e5a2b3dca196afd0816224ae72b587017dc3b2",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
@@ -423,10 +543,10 @@
             }
         }
     },
-    "TestOverflow_d0g0v0_Metropolis" : {
+    "TestOverflow_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/stSolidityTest/TestOverflow_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +557,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xa488",
-                    "hash" : "0xaf0ad3a095b679a864df9af65edef1f061868ac0bf85f1342ebcf29e52f75501",
-                    "mixHash" : "0x449f1dbc47f7be995d8654827750b48a0cabf8da566c59ada2007e77db90c112",
-                    "nonce" : "0x28ecbe802facc1e3",
+                    "gasUsed" : "0xa35c",
+                    "hash" : "0xf466c806778125dc39ed0486f70879669eda582424c3d5f33143118a81a5df60",
+                    "mixHash" : "0x474982451a27d2662e06abb5db7d73f7220dd0a0ab11eb63182e38291ecba4ce",
+                    "nonce" : "0x1094285bc740cd87",
                     "number" : "0x01",
                     "parentHash" : "0xdca5b3cbe8cf7e5c715a7023c26a294625272e421b09cc81efc21b65b29e1d8e",
-                    "receiptTrie" : "0xda94f1a89f6c4d10fd8fc7cf9b42c31508d676e690fcf6e74a2c92517cdbc275",
-                    "stateRoot" : "0x4b66fde083e410ae8281007421c9cb7a5d01a55ac93107f120c7575de0a7c211",
+                    "receiptTrie" : "0x51fdce2a815c4f7c956f387a7d65b1a0275268e273e417d025c36a04285b7559",
+                    "stateRoot" : "0x6468d61b74a2a19b7b4ad19108d95b3dd5d278cb7767e349ba05fe2947a645f0",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90269f901fca0dca5b3cbe8cf7e5c715a7023c26a294625272e421b09cc81efc21b65b29e1d8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b66fde083e410ae8281007421c9cb7a5d01a55ac93107f120c7575de0a7c211a07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0da94f1a89f6c4d10fd8fc7cf9b42c31508d676e690fcf6e74a2c92517cdbc275b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a4888203e880a0449f1dbc47f7be995d8654827750b48a0cabf8da566c59ada2007e77db90c1128828ecbe802facc1e3f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
+                "rlp" : "0xf90269f901fca0dca5b3cbe8cf7e5c715a7023c26a294625272e421b09cc81efc21b65b29e1d8ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06468d61b74a2a19b7b4ad19108d95b3dd5d278cb7767e349ba05fe2947a645f0a07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a051fdce2a815c4f7c956f387a7d65b1a0275268e273e417d025c36a04285b7559b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff82a35c8203e880a0474982451a27d2662e06abb5db7d73f7220dd0a0ab11eb63182e38291ecba4ce881094285bc740cd87f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -486,16 +606,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0406245bf6d5687082ad42d88d31628cf2a49427556d762ed794585451552d9a5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaf0ad3a095b679a864df9af65edef1f061868ac0bf85f1342ebcf29e52f75501",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xf466c806778125dc39ed0486f70879669eda582424c3d5f33143118a81a5df60",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6000357c0100000000000000000000000000000000000000000000000000000000900480638040cac41461003a578063c04062261461004c57005b610042610099565b8060005260206000f35b61005461005e565b8060005260206000f35b6000610068610099565b600060006101000a81548160ff02191690830217905550600060009054906101000a900460ff169050610096565b90565b60006000600060006001935083507fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff925060006001840114156100db576100e4565b6000935061013b565b63ffffffff915060006001830163ffffffff1614156101025761010b565b6000935061013b565b67ffffffffffffffff905060006001820167ffffffffffffffff1614156101315761013a565b6000935061013b565b5b5050509056",
@@ -505,14 +618,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a488",
+                "balance" : "0x4563918244f4a35c",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x02fa4bf8",
+                "balance" : "0x02fa4d24",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stSolidityTest/TestStoreGasPrices_d0g0v0.json b/BlockchainTests/GeneralStateTests/stSolidityTest/TestStoreGasPrices_d0g0v0.json
index 5831a3a5c..2e7ac7d38 100644
--- a/BlockchainTests/GeneralStateTests/stSolidityTest/TestStoreGasPrices_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stSolidityTest/TestStoreGasPrices_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "TestStoreGasPrices_d0g0v0_EIP150" : {
+    "TestStoreGasPrices_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestStoreGasPrices_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x029dfe",
-                    "hash" : "0xace88013e182ea167d0efb3cef69799a630a399b7b3d132a968d68d4f588db25",
-                    "mixHash" : "0xc16d332a8e2338813b174de25fff6290a130282320a4efe898d73b75f9c48809",
-                    "nonce" : "0x37ce9a58b960663e",
+                    "hash" : "0xb238416b2ca5a96949a9f3d75fe0c645e3ec76a555a1e22f5e539fb2c6fadbea",
+                    "mixHash" : "0x30ee89a5b3873e5ea6b6ad4b9230006fb18b8fe587fb7e31e52d9173c79b516c",
+                    "nonce" : "0x068f253abb8dfbbb",
                     "number" : "0x01",
                     "parentHash" : "0xc73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658",
-                    "receiptTrie" : "0x500416b2b894b8fb32bbd4a68483b7edf78627d7a74d10000a97e35b180b95ce",
-                    "stateRoot" : "0x15fee9aaec9277bb0046ff3fe63974239268bb3b320a30f0493dbd4159769037",
+                    "receiptTrie" : "0x166bc0d49c450b1f915cda4210e9062b1588baab16a9f3b900941d94bc879c0b",
+                    "stateRoot" : "0x1973ed746ffc05f5a6a556ed2b690bafb6ba8db534cb5b394e5fed9940828ffa",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0c73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015fee9aaec9277bb0046ff3fe63974239268bb3b320a30f0493dbd4159769037a07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0500416b2b894b8fb32bbd4a68483b7edf78627d7a74d10000a97e35b180b95ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83029dfe8203e880a0c16d332a8e2338813b174de25fff6290a130282320a4efe898d73b75f9c488098837ce9a58b960663ef867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
+                "rlp" : "0xf9026af901fda0c73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01973ed746ffc05f5a6a556ed2b690bafb6ba8db534cb5b394e5fed9940828ffaa07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0166bc0d49c450b1f915cda4210e9062b1588baab16a9f3b900941d94bc879c0bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83029dfe8203e880a030ee89a5b3873e5ea6b6ad4b9230006fb18b8fe587fb7e31e52d9173c79b516c88068f253abb8dfbbbf867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fbafc42f4c1e19667dd7941190f9ecde3c77fae9bb1930e3f7d3c8a22696bf41a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xace88013e182ea167d0efb3cef69799a630a399b7b3d132a968d68d4f588db25",
-        "network" : "EIP150",
+        "lastblockhash" : "0xb238416b2ca5a96949a9f3d75fe0c645e3ec76a555a1e22f5e539fb2c6fadbea",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114602d57005b6033603d565b8060005260206000f35b600060005a600160205590505a81036000555a600260205590505a81036001555a600260205590505a81036002555a65168aa8d53fe660205590505a81036003555a600260205590505a81036004555a600060205590505a81036005555a5060019291505056",
@@ -110,10 +117,10 @@
             }
         }
     },
-    "TestStoreGasPrices_d0g0v0_EIP158" : {
+    "TestStoreGasPrices_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/stSolidityTest/TestStoreGasPrices_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -125,18 +132,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x029dfe",
-                    "hash" : "0x5314985413657aeee8e1a5078111cf13330d9e59175f178cef5d4cbe309aa0e3",
-                    "mixHash" : "0xf18cda0a187cdda14b1638d642640796ccb389a700c93f5ea558e2569f8f3e6a",
-                    "nonce" : "0x641a6fe64b7c7e60",
+                    "hash" : "0x7f6d886941a788d20d81727e7ae93eaa657488fbf1f1b0cf7aee1059b77bf4ce",
+                    "mixHash" : "0xdfae133c1f6ae4245a441e1fcc9400ba9efdcda41055983a06282e4bdd6de1f9",
+                    "nonce" : "0x2a7988295b08f329",
                     "number" : "0x01",
                     "parentHash" : "0xc73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658",
-                    "receiptTrie" : "0x500416b2b894b8fb32bbd4a68483b7edf78627d7a74d10000a97e35b180b95ce",
-                    "stateRoot" : "0x15fee9aaec9277bb0046ff3fe63974239268bb3b320a30f0493dbd4159769037",
+                    "receiptTrie" : "0x166bc0d49c450b1f915cda4210e9062b1588baab16a9f3b900941d94bc879c0b",
+                    "stateRoot" : "0x1973ed746ffc05f5a6a556ed2b690bafb6ba8db534cb5b394e5fed9940828ffa",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0c73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015fee9aaec9277bb0046ff3fe63974239268bb3b320a30f0493dbd4159769037a07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0500416b2b894b8fb32bbd4a68483b7edf78627d7a74d10000a97e35b180b95ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83029dfe8203e880a0f18cda0a187cdda14b1638d642640796ccb389a700c93f5ea558e2569f8f3e6a88641a6fe64b7c7e60f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
+                "rlp" : "0xf9026af901fda0c73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01973ed746ffc05f5a6a556ed2b690bafb6ba8db534cb5b394e5fed9940828ffaa07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0166bc0d49c450b1f915cda4210e9062b1588baab16a9f3b900941d94bc879c0bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83029dfe8203e880a0dfae133c1f6ae4245a441e1fcc9400ba9efdcda41055983a06282e4bdd6de1f9882a7988295b08f329f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -173,9 +180,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fbafc42f4c1e19667dd7941190f9ecde3c77fae9bb1930e3f7d3c8a22696bf41a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5314985413657aeee8e1a5078111cf13330d9e59175f178cef5d4cbe309aa0e3",
-        "network" : "EIP158",
+        "lastblockhash" : "0x7f6d886941a788d20d81727e7ae93eaa657488fbf1f1b0cf7aee1059b77bf4ce",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114602d57005b6033603d565b8060005260206000f35b600060005a600160205590505a81036000555a600260205590505a81036001555a600260205590505a81036002555a65168aa8d53fe660205590505a81036003555a600260205590505a81036004555a600060205590505a81036005555a5060019291505056",
@@ -221,10 +235,10 @@
             }
         }
     },
-    "TestStoreGasPrices_d0g0v0_Frontier" : {
+    "TestStoreGasPrices_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestStoreGasPrices_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -236,9 +250,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x029dfe",
-                    "hash" : "0x4e9db5d17e9434c8423dbeed89b83c320377aded7ca80c918d440d9ee9a9d13b",
-                    "mixHash" : "0xc16fc5bb69d1b82be453d1856c80adc6a0b925fd1561ae75716220795dda4542",
-                    "nonce" : "0xface48881597a133",
+                    "hash" : "0xa99d5e708f1c2eb0b2d7f3d6281db887bb80fcefb3e8098a9496910c77c1705b",
+                    "mixHash" : "0xd528d8ce181cc0c96bef693504d62aec32cb6a62f411f0c5cf62fb6a49ffbb21",
+                    "nonce" : "0xa1177766a2922c27",
                     "number" : "0x01",
                     "parentHash" : "0xc73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658",
                     "receiptTrie" : "0x500416b2b894b8fb32bbd4a68483b7edf78627d7a74d10000a97e35b180b95ce",
@@ -247,7 +261,7 @@
                     "transactionsTrie" : "0x7ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0c73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015fee9aaec9277bb0046ff3fe63974239268bb3b320a30f0493dbd4159769037a07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0500416b2b894b8fb32bbd4a68483b7edf78627d7a74d10000a97e35b180b95ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83029dfe8203e880a0c16fc5bb69d1b82be453d1856c80adc6a0b925fd1561ae75716220795dda454288face48881597a133f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
+                "rlp" : "0xf9026af901fda0c73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015fee9aaec9277bb0046ff3fe63974239268bb3b320a30f0493dbd4159769037a07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0500416b2b894b8fb32bbd4a68483b7edf78627d7a74d10000a97e35b180b95ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83029dfe8203e880a0d528d8ce181cc0c96bef693504d62aec32cb6a62f411f0c5cf62fb6a49ffbb2188a1177766a2922c27f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -284,8 +298,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fbafc42f4c1e19667dd7941190f9ecde3c77fae9bb1930e3f7d3c8a22696bf41a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4e9db5d17e9434c8423dbeed89b83c320377aded7ca80c918d440d9ee9a9d13b",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa99d5e708f1c2eb0b2d7f3d6281db887bb80fcefb3e8098a9496910c77c1705b",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
@@ -332,10 +346,10 @@
             }
         }
     },
-    "TestStoreGasPrices_d0g0v0_Homestead" : {
+    "TestStoreGasPrices_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestStoreGasPrices_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -347,9 +361,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x029dfe",
-                    "hash" : "0xbf26388c4b4f2e557763edeb2b9bf03e646ef1f9ada0addfa2b4edeb18a28c11",
-                    "mixHash" : "0xa46d80ac8c84bbbf8b5926fe80b6824bc231bfb614241cb175ee4d80386e182b",
-                    "nonce" : "0x796b2e7938272db1",
+                    "hash" : "0x8d7b449283a26360ee6b06b60e2a7ab86d283e0e9ef8bd5aaf46c560122b98b1",
+                    "mixHash" : "0x0084e823a98e8609043251e5bfd4b416ed7054e2d3f6486eb283aedef998afc9",
+                    "nonce" : "0xdef0df946a1dfbfd",
                     "number" : "0x01",
                     "parentHash" : "0xc73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658",
                     "receiptTrie" : "0x500416b2b894b8fb32bbd4a68483b7edf78627d7a74d10000a97e35b180b95ce",
@@ -358,7 +372,7 @@
                     "transactionsTrie" : "0x7ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0c73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015fee9aaec9277bb0046ff3fe63974239268bb3b320a30f0493dbd4159769037a07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0500416b2b894b8fb32bbd4a68483b7edf78627d7a74d10000a97e35b180b95ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83029dfe8203e880a0a46d80ac8c84bbbf8b5926fe80b6824bc231bfb614241cb175ee4d80386e182b88796b2e7938272db1f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
+                "rlp" : "0xf9026af901fda0c73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015fee9aaec9277bb0046ff3fe63974239268bb3b320a30f0493dbd4159769037a07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0500416b2b894b8fb32bbd4a68483b7edf78627d7a74d10000a97e35b180b95ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83029dfe8203e880a00084e823a98e8609043251e5bfd4b416ed7054e2d3f6486eb283aedef998afc988def0df946a1dfbfdf867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -395,8 +409,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fbafc42f4c1e19667dd7941190f9ecde3c77fae9bb1930e3f7d3c8a22696bf41a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbf26388c4b4f2e557763edeb2b9bf03e646ef1f9ada0addfa2b4edeb18a28c11",
-        "network" : "Homestead",
+        "lastblockhash" : "0x8d7b449283a26360ee6b06b60e2a7ab86d283e0e9ef8bd5aaf46c560122b98b1",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
@@ -443,10 +457,10 @@
             }
         }
     },
-    "TestStoreGasPrices_d0g0v0_Metropolis" : {
+    "TestStoreGasPrices_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestStoreGasPrices_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -458,18 +472,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x029dfe",
-                    "hash" : "0x4948ac3aac86e87c43c0c1b26d4434c8480cbe2a11554317e777308c215a7c42",
-                    "mixHash" : "0x99428b98f73db55c71e80a89effd65d5dea9d6b0612c15c489a2ec82ca827ba0",
-                    "nonce" : "0x5c03ef6d9d9c166a",
+                    "hash" : "0xb009b29f2e864ab6be6ea50781f5929c1c374a7537e0de87f7a6fca8e852943c",
+                    "mixHash" : "0x0f871a5bc83e5f6affe5d83cad34d7d951691a80b76b1a7e3c8774fba2a0da01",
+                    "nonce" : "0x60223b84d3ea3ca9",
                     "number" : "0x01",
                     "parentHash" : "0xc73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658",
-                    "receiptTrie" : "0x166bc0d49c450b1f915cda4210e9062b1588baab16a9f3b900941d94bc879c0b",
-                    "stateRoot" : "0x1973ed746ffc05f5a6a556ed2b690bafb6ba8db534cb5b394e5fed9940828ffa",
+                    "receiptTrie" : "0x500416b2b894b8fb32bbd4a68483b7edf78627d7a74d10000a97e35b180b95ce",
+                    "stateRoot" : "0x15fee9aaec9277bb0046ff3fe63974239268bb3b320a30f0493dbd4159769037",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0c73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01973ed746ffc05f5a6a556ed2b690bafb6ba8db534cb5b394e5fed9940828ffaa07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0166bc0d49c450b1f915cda4210e9062b1588baab16a9f3b900941d94bc879c0bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83029dfe8203e880a099428b98f73db55c71e80a89effd65d5dea9d6b0612c15c489a2ec82ca827ba0885c03ef6d9d9c166af867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
+                "rlp" : "0xf9026af901fda0c73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015fee9aaec9277bb0046ff3fe63974239268bb3b320a30f0493dbd4159769037a07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0500416b2b894b8fb32bbd4a68483b7edf78627d7a74d10000a97e35b180b95ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83029dfe8203e880a00f871a5bc83e5f6affe5d83cad34d7d951691a80b76b1a7e3c8774fba2a0da018860223b84d3ea3ca9f867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -506,16 +520,120 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fbafc42f4c1e19667dd7941190f9ecde3c77fae9bb1930e3f7d3c8a22696bf41a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4948ac3aac86e87c43c0c1b26d4434c8480cbe2a11554317e777308c215a7c42",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xb009b29f2e864ab6be6ea50781f5929c1c374a7537e0de87f7a6fca8e852943c",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114602d57005b6033603d565b8060005260206000f35b600060005a600160205590505a81036000555a600260205590505a81036001555a600260205590505a81036002555a65168aa8d53fe660205590505a81036003555a600260205590505a81036004555a600060205590505a81036005555a5060019291505056",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x4e2d",
+                    "0x01" : "0x1395",
+                    "0x02" : "0x1395",
+                    "0x03" : "0x1395",
+                    "0x04" : "0x1395",
+                    "0x05" : "0x1395"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f69dfe",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x02f85282",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114602d57005b6033603d565b8060005260206000f35b600060005a600160205590505a81036000555a600260205590505a81036001555a600260205590505a81036002555a65168aa8d53fe660205590505a81036003555a600260205590505a81036004555a600060205590505a81036005555a5060019291505056",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x02faf080",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "TestStoreGasPrices_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestStoreGasPrices_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x029dfe",
+                    "hash" : "0x93b7b62a86f92f2d2763aff055ac8667c846a1405e69350ea08b83290f199bc0",
+                    "mixHash" : "0x761bf5f08cdff7f2204852c764792b716274bce1f3c0e6233ed4358fa3478a7b",
+                    "nonce" : "0xe69f55b2479b9a6b",
+                    "number" : "0x01",
+                    "parentHash" : "0xc73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658",
+                    "receiptTrie" : "0x500416b2b894b8fb32bbd4a68483b7edf78627d7a74d10000a97e35b180b95ce",
+                    "stateRoot" : "0x15fee9aaec9277bb0046ff3fe63974239268bb3b320a30f0493dbd4159769037",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9026af901fda0c73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015fee9aaec9277bb0046ff3fe63974239268bb3b320a30f0493dbd4159769037a07ac566294ed3512f8e0d2d8f9d26f6444d714df51f76b82f9218ea8e40ca1e05a0500416b2b894b8fb32bbd4a68483b7edf78627d7a74d10000a97e35b180b95ceb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83029dfe8203e880a0761bf5f08cdff7f2204852c764792b716274bce1f3c0e6233ed4358fa3478a7b88e69f55b2479b9a6bf867f86580018402160ec094095e7baea6a6c7c4c2dfeb977efac326af552d878084c04062261ca03ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fea0479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98cc0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x02160ec0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x3ba06ba2264c9b13af9e362a1923b6e13ed81e3a0395712dde9ba065d55b22fe",
+                        "s" : "0x479bff8d4b24cb7ecaf24bd2d79fe31ffca0d02e874bc96354f79c5a9afba98c",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0xc73e7d973ab2d85b6b5dfd3d21e35845ef8ef7526283dfa1c357824fc7fe5658",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xfbafc42f4c1e19667dd7941190f9ecde3c77fae9bb1930e3f7d3c8a22696bf41",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fbafc42f4c1e19667dd7941190f9ecde3c77fae9bb1930e3f7d3c8a22696bf41a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x93b7b62a86f92f2d2763aff055ac8667c846a1405e69350ea08b83290f199bc0",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0186a0",
                 "code" : "0x7c01000000000000000000000000000000000000000000000000000000006000350463c04062268114602d57005b6033603d565b8060005260206000f35b600060005a600160205590505a81036000555a600260205590505a81036001555a600260205590505a81036002555a65168aa8d53fe660205590505a81036003555a600260205590505a81036004555a600060205590505a81036005555a5060019291505056",
diff --git a/BlockchainTests/GeneralStateTests/stSolidityTest/TestStructuresAndVariabless_d0g0v0.json b/BlockchainTests/GeneralStateTests/stSolidityTest/TestStructuresAndVariabless_d0g0v0.json
index eecb87b38..572ff1445 100644
--- a/BlockchainTests/GeneralStateTests/stSolidityTest/TestStructuresAndVariabless_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stSolidityTest/TestStructuresAndVariabless_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "TestStructuresAndVariabless_d0g0v0_EIP150" : {
+    "TestStructuresAndVariabless_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestStructuresAndVariabless_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x02328d",
-                    "hash" : "0x0a196956f621aa3cb78bcc53acfba0b760c3db94e6293b26ec84cdb18ff98d68",
-                    "mixHash" : "0x57aea98ad7cfd1669bd50013a732fc732a7a2a515831e80fde9b227cf2438d0d",
-                    "nonce" : "0x978ef98e938720ef",
+                    "hash" : "0xda55dafbae26494a4f679345059b66a2c4028454106331f9c3bb5b1f71c67a33",
+                    "mixHash" : "0x5f0fc269987080f73e18d122fac26e8dee0b63b2eb90c530f577fb918c4b8718",
+                    "nonce" : "0x71573f6257214f9d",
                     "number" : "0x01",
                     "parentHash" : "0x277020daf0b2986de0b53b7af6278659c3460dcd8cd1190e467ee4313afaaf00",
-                    "receiptTrie" : "0x5671cfd4f2ba75d0823865906e0648d2cbbe1c5c748c61ed9841634d3596b497",
-                    "stateRoot" : "0xbee1cbbd0ff05df6769f54bb9bd0f2f5181185519a1852dfd9b5f28f234e6e31",
+                    "receiptTrie" : "0xc043cee109033a937fd793c0c4ec439fa29ecdfd8e315252399c51a0dfa5bb7c",
+                    "stateRoot" : "0x7f5b729e5eb2269b7e9066a99baebdf118d6b5c068a17912c304529182353279",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90269f901fda0277020daf0b2986de0b53b7af6278659c3460dcd8cd1190e467ee4313afaaf00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bee1cbbd0ff05df6769f54bb9bd0f2f5181185519a1852dfd9b5f28f234e6e31a0840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4a05671cfd4f2ba75d0823865906e0648d2cbbe1c5c748c61ed9841634d3596b497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8302328d8203e880a057aea98ad7cfd1669bd50013a732fc732a7a2a515831e80fde9b227cf2438d0d88978ef98e938720eff866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba04b5305634acd08c1bdb367bf5e3f44499a16f4157f62241ad9780b31da94af42a057e2df90dc63621d959c8f2d19d15b70b7722d5fb4825348dd710da861e80dafc0",
+                "rlp" : "0xf90269f901fda0277020daf0b2986de0b53b7af6278659c3460dcd8cd1190e467ee4313afaaf00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f5b729e5eb2269b7e9066a99baebdf118d6b5c068a17912c304529182353279a0840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4a0c043cee109033a937fd793c0c4ec439fa29ecdfd8e315252399c51a0dfa5bb7cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8302328d8203e880a05f0fc269987080f73e18d122fac26e8dee0b63b2eb90c530f577fb918c4b87188871573f6257214f9df866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba04b5305634acd08c1bdb367bf5e3f44499a16f4157f62241ad9780b31da94af42a057e2df90dc63621d959c8f2d19d15b70b7722d5fb4825348dd710da861e80dafc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017e091d8ced26108637c9e9bb797ad52373f24cbdca74f276c02d3b99c845727a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0a196956f621aa3cb78bcc53acfba0b760c3db94e6293b26ec84cdb18ff98d68",
-        "network" : "EIP150",
+        "lastblockhash" : "0xda55dafbae26494a4f679345059b66a2c4028454106331f9c3bb5b1f71c67a33",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x018704",
                 "code" : "0x7c010000000000000000000000000000000000000000000000000000000060003504632a9afb838114610039578063c04062261461004b57005b61004161005d565b8060005260206000f35b61005361016c565b8060005260206000f35b600160ff8154141561006e57610076565b506000610169565b60015460035414156100875761008f565b506000610169565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b73ffffffffffffffffffffffffffffffffffffffff60016002540481161614156100cd576100d5565b506000610169565b7f676c6f62616c2064617461203332206c656e67746820737472696e670000000060045414156101045761010c565b506000610169565b6005600080815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673a94f5374fce5edbc8e2a8697c15331677e6ebf0b141561016057610168565b506000610169565b5b90565b600060ff806001555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b6002805473ffffffffffffffffffffffffffffffffffffffff1916821790555060ff80600355507f676c6f62616c2064617461203332206c656e67746820737472696e6700000000806004555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b6005600080815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff0219169083021790555061022f61005d565b600060006101000a81548160ff0219169083021790555060ff6001600054041690509056",
@@ -110,10 +117,128 @@
             }
         }
     },
-    "TestStructuresAndVariabless_d0g0v0_EIP158" : {
+    "TestStructuresAndVariabless_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestStructuresAndVariabless_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x02328d",
+                    "hash" : "0x37ba3a2b3020af39bb5e7caece069822e2d29d415d3ae37e3b6b90a8e520fa19",
+                    "mixHash" : "0xd3e08164acbf7bab36df169a90cef460b9e7664ec4c0d18653e74a166c12f5ca",
+                    "nonce" : "0xfedf81e53ea5be75",
+                    "number" : "0x01",
+                    "parentHash" : "0x277020daf0b2986de0b53b7af6278659c3460dcd8cd1190e467ee4313afaaf00",
+                    "receiptTrie" : "0xc043cee109033a937fd793c0c4ec439fa29ecdfd8e315252399c51a0dfa5bb7c",
+                    "stateRoot" : "0x7f5b729e5eb2269b7e9066a99baebdf118d6b5c068a17912c304529182353279",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90269f901fda0277020daf0b2986de0b53b7af6278659c3460dcd8cd1190e467ee4313afaaf00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f5b729e5eb2269b7e9066a99baebdf118d6b5c068a17912c304529182353279a0840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4a0c043cee109033a937fd793c0c4ec439fa29ecdfd8e315252399c51a0dfa5bb7cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8302328d8203e880a0d3e08164acbf7bab36df169a90cef460b9e7664ec4c0d18653e74a166c12f5ca88fedf81e53ea5be75f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba04b5305634acd08c1bdb367bf5e3f44499a16f4157f62241ad9780b31da94af42a057e2df90dc63621d959c8f2d19d15b70b7722d5fb4825348dd710da861e80dafc0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x055730",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4b5305634acd08c1bdb367bf5e3f44499a16f4157f62241ad9780b31da94af42",
+                        "s" : "0x57e2df90dc63621d959c8f2d19d15b70b7722d5fb4825348dd710da861e80daf",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x64"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0x277020daf0b2986de0b53b7af6278659c3460dcd8cd1190e467ee4313afaaf00",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x17e091d8ced26108637c9e9bb797ad52373f24cbdca74f276c02d3b99c845727",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017e091d8ced26108637c9e9bb797ad52373f24cbdca74f276c02d3b99c845727a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x37ba3a2b3020af39bb5e7caece069822e2d29d415d3ae37e3b6b90a8e520fa19",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x018704",
+                "code" : "0x7c010000000000000000000000000000000000000000000000000000000060003504632a9afb838114610039578063c04062261461004b57005b61004161005d565b8060005260206000f35b61005361016c565b8060005260206000f35b600160ff8154141561006e57610076565b506000610169565b60015460035414156100875761008f565b506000610169565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b73ffffffffffffffffffffffffffffffffffffffff60016002540481161614156100cd576100d5565b506000610169565b7f676c6f62616c2064617461203332206c656e67746820737472696e670000000060045414156101045761010c565b506000610169565b6005600080815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673a94f5374fce5edbc8e2a8697c15331677e6ebf0b141561016057610168565b506000610169565b5b90565b600060ff806001555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b6002805473ffffffffffffffffffffffffffffffffffffffff1916821790555060ff80600355507f676c6f62616c2064617461203332206c656e67746820737472696e6700000000806004555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b6005600080815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff0219169083021790555061022f61005d565b600060006101000a81548160ff0219169083021790555060ff6001600054041690509056",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0xff",
+                    "0x02" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
+                    "0x03" : "0xff",
+                    "0x04" : "0x676c6f62616c2064617461203332206c656e67746820737472696e6700000000",
+                    "0x05b8ccbb9d4d8fb16ea74ce3c29a41f1b461fbdaff4714a0d9a8eb05499746bc" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f6328d",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0d0f4f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0186a0",
+                "code" : "0x7c010000000000000000000000000000000000000000000000000000000060003504632a9afb838114610039578063c04062261461004b57005b61004161005d565b8060005260206000f35b61005361016c565b8060005260206000f35b600160ff8154141561006e57610076565b506000610169565b60015460035414156100875761008f565b506000610169565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b73ffffffffffffffffffffffffffffffffffffffff60016002540481161614156100cd576100d5565b506000610169565b7f676c6f62616c2064617461203332206c656e67746820737472696e670000000060045414156101045761010c565b506000610169565b6005600080815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673a94f5374fce5edbc8e2a8697c15331677e6ebf0b141561016057610168565b506000610169565b5b90565b600060ff806001555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b6002805473ffffffffffffffffffffffffffffffffffffffff1916821790555060ff80600355507f676c6f62616c2064617461203332206c656e67746820737472696e6700000000806004555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b6005600080815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff0219169083021790555061022f61005d565b600060006101000a81548160ff0219169083021790555060ff6001600054041690509056",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "TestStructuresAndVariabless_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestStructuresAndVariabless_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -125,9 +250,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x02328d",
-                    "hash" : "0x53cc3f0d006fe923c64c52d04003fed8a1e58fd302edf5e33447629ec25107bc",
-                    "mixHash" : "0xd4e509aeb6862749614f945519c4533a17fe665e109cd2f6238f78fb404ace65",
-                    "nonce" : "0x842607e7822243b9",
+                    "hash" : "0xc019c577421ba4147b481e71a6620f727b254409468e466e9a26fd20d657c213",
+                    "mixHash" : "0x9f0963d4ba8777e2325942023143c53425b30dd6fe62efc005c1476f8cebc088",
+                    "nonce" : "0xd21041af0595c4db",
                     "number" : "0x01",
                     "parentHash" : "0x277020daf0b2986de0b53b7af6278659c3460dcd8cd1190e467ee4313afaaf00",
                     "receiptTrie" : "0x5671cfd4f2ba75d0823865906e0648d2cbbe1c5c748c61ed9841634d3596b497",
@@ -136,7 +261,7 @@
                     "transactionsTrie" : "0x840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90269f901fda0277020daf0b2986de0b53b7af6278659c3460dcd8cd1190e467ee4313afaaf00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bee1cbbd0ff05df6769f54bb9bd0f2f5181185519a1852dfd9b5f28f234e6e31a0840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4a05671cfd4f2ba75d0823865906e0648d2cbbe1c5c748c61ed9841634d3596b497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8302328d8203e880a0d4e509aeb6862749614f945519c4533a17fe665e109cd2f6238f78fb404ace6588842607e7822243b9f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba04b5305634acd08c1bdb367bf5e3f44499a16f4157f62241ad9780b31da94af42a057e2df90dc63621d959c8f2d19d15b70b7722d5fb4825348dd710da861e80dafc0",
+                "rlp" : "0xf90269f901fda0277020daf0b2986de0b53b7af6278659c3460dcd8cd1190e467ee4313afaaf00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bee1cbbd0ff05df6769f54bb9bd0f2f5181185519a1852dfd9b5f28f234e6e31a0840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4a05671cfd4f2ba75d0823865906e0648d2cbbe1c5c748c61ed9841634d3596b497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8302328d8203e880a09f0963d4ba8777e2325942023143c53425b30dd6fe62efc005c1476f8cebc08888d21041af0595c4dbf866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba04b5305634acd08c1bdb367bf5e3f44499a16f4157f62241ad9780b31da94af42a057e2df90dc63621d959c8f2d19d15b70b7722d5fb4825348dd710da861e80dafc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -173,8 +298,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017e091d8ced26108637c9e9bb797ad52373f24cbdca74f276c02d3b99c845727a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x53cc3f0d006fe923c64c52d04003fed8a1e58fd302edf5e33447629ec25107bc",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc019c577421ba4147b481e71a6620f727b254409468e466e9a26fd20d657c213",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x018704",
@@ -221,10 +346,10 @@
             }
         }
     },
-    "TestStructuresAndVariabless_d0g0v0_Frontier" : {
+    "TestStructuresAndVariabless_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestStructuresAndVariabless_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -235,19 +360,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x022cb1",
-                    "hash" : "0xdf2bafbbca2526d06d613473126a76b0c4abac0b13700833023adf7012a2c525",
-                    "mixHash" : "0xa0c3f037e30a228a2e8735979b8eee0604bbcc16ea7d264fff3e6e74a9980907",
-                    "nonce" : "0x95e047e47d5442e5",
+                    "gasUsed" : "0x02328d",
+                    "hash" : "0xe5fc35ca83631cbf64bfde5d95d1f53a069b0987be64b869089f1bc2f14a10f4",
+                    "mixHash" : "0x2043a47dcfc2dcc12ab6c0ead976f2ad77e58f8bd164e3af7e37dc259433b673",
+                    "nonce" : "0x41310e2fd65bb869",
                     "number" : "0x01",
                     "parentHash" : "0x277020daf0b2986de0b53b7af6278659c3460dcd8cd1190e467ee4313afaaf00",
-                    "receiptTrie" : "0x300dd79c4cd80c5a9bc39b861b83ac727d9fa025d21f715c0f211a7669db47fd",
-                    "stateRoot" : "0x71d9d927722831676211f0d5e7047dd780fafc8d32d67807f93de7b16c3eee4d",
+                    "receiptTrie" : "0x5671cfd4f2ba75d0823865906e0648d2cbbe1c5c748c61ed9841634d3596b497",
+                    "stateRoot" : "0xbee1cbbd0ff05df6769f54bb9bd0f2f5181185519a1852dfd9b5f28f234e6e31",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90269f901fda0277020daf0b2986de0b53b7af6278659c3460dcd8cd1190e467ee4313afaaf00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa071d9d927722831676211f0d5e7047dd780fafc8d32d67807f93de7b16c3eee4da0840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4a0300dd79c4cd80c5a9bc39b861b83ac727d9fa025d21f715c0f211a7669db47fdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83022cb18203e880a0a0c3f037e30a228a2e8735979b8eee0604bbcc16ea7d264fff3e6e74a99809078895e047e47d5442e5f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba04b5305634acd08c1bdb367bf5e3f44499a16f4157f62241ad9780b31da94af42a057e2df90dc63621d959c8f2d19d15b70b7722d5fb4825348dd710da861e80dafc0",
+                "rlp" : "0xf90269f901fda0277020daf0b2986de0b53b7af6278659c3460dcd8cd1190e467ee4313afaaf00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bee1cbbd0ff05df6769f54bb9bd0f2f5181185519a1852dfd9b5f28f234e6e31a0840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4a05671cfd4f2ba75d0823865906e0648d2cbbe1c5c748c61ed9841634d3596b497b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8302328d8203e880a02043a47dcfc2dcc12ab6c0ead976f2ad77e58f8bd164e3af7e37dc259433b6738841310e2fd65bb869f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba04b5305634acd08c1bdb367bf5e3f44499a16f4157f62241ad9780b31da94af42a057e2df90dc63621d959c8f2d19d15b70b7722d5fb4825348dd710da861e80dafc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -284,8 +409,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017e091d8ced26108637c9e9bb797ad52373f24cbdca74f276c02d3b99c845727a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdf2bafbbca2526d06d613473126a76b0c4abac0b13700833023adf7012a2c525",
-        "network" : "Frontier",
+        "lastblockhash" : "0xe5fc35ca83631cbf64bfde5d95d1f53a069b0987be64b869089f1bc2f14a10f4",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x018704",
@@ -301,14 +426,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f62cb1",
+                "balance" : "0x4563918244f6328d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0d152b",
+                "balance" : "0x0d0f4f",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -332,10 +457,10 @@
             }
         }
     },
-    "TestStructuresAndVariabless_d0g0v0_Homestead" : {
+    "TestStructuresAndVariabless_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stSolidityTest/TestStructuresAndVariabless_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -347,9 +472,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x022cb1",
-                    "hash" : "0x023edc1f3d467d99dfce72658a196027de774b3b3df398cc1c3e31aa70b8c743",
-                    "mixHash" : "0x9d3e5164b1ba1be1533df3c2189a2fcced05ba61f5258d58fea0d315a19a1373",
-                    "nonce" : "0x84f8b3637edf2a14",
+                    "hash" : "0xc963e35268279cbe0d2bd8832c1d8de286dc188c3715d7ea8959e69ff66ec2f8",
+                    "mixHash" : "0x7b065982aa00983b4f479ed073c61e5e3bdc9fb3e47b32b602239ddf01489672",
+                    "nonce" : "0xe026a1df06c0bb10",
                     "number" : "0x01",
                     "parentHash" : "0x277020daf0b2986de0b53b7af6278659c3460dcd8cd1190e467ee4313afaaf00",
                     "receiptTrie" : "0x300dd79c4cd80c5a9bc39b861b83ac727d9fa025d21f715c0f211a7669db47fd",
@@ -358,7 +483,7 @@
                     "transactionsTrie" : "0x840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90269f901fda0277020daf0b2986de0b53b7af6278659c3460dcd8cd1190e467ee4313afaaf00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa071d9d927722831676211f0d5e7047dd780fafc8d32d67807f93de7b16c3eee4da0840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4a0300dd79c4cd80c5a9bc39b861b83ac727d9fa025d21f715c0f211a7669db47fdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83022cb18203e880a09d3e5164b1ba1be1533df3c2189a2fcced05ba61f5258d58fea0d315a19a13738884f8b3637edf2a14f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba04b5305634acd08c1bdb367bf5e3f44499a16f4157f62241ad9780b31da94af42a057e2df90dc63621d959c8f2d19d15b70b7722d5fb4825348dd710da861e80dafc0",
+                "rlp" : "0xf90269f901fda0277020daf0b2986de0b53b7af6278659c3460dcd8cd1190e467ee4313afaaf00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa071d9d927722831676211f0d5e7047dd780fafc8d32d67807f93de7b16c3eee4da0840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4a0300dd79c4cd80c5a9bc39b861b83ac727d9fa025d21f715c0f211a7669db47fdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83022cb18203e880a07b065982aa00983b4f479ed073c61e5e3bdc9fb3e47b32b602239ddf0148967288e026a1df06c0bb10f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba04b5305634acd08c1bdb367bf5e3f44499a16f4157f62241ad9780b31da94af42a057e2df90dc63621d959c8f2d19d15b70b7722d5fb4825348dd710da861e80dafc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -395,8 +520,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017e091d8ced26108637c9e9bb797ad52373f24cbdca74f276c02d3b99c845727a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x023edc1f3d467d99dfce72658a196027de774b3b3df398cc1c3e31aa70b8c743",
-        "network" : "Homestead",
+        "lastblockhash" : "0xc963e35268279cbe0d2bd8832c1d8de286dc188c3715d7ea8959e69ff66ec2f8",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x018704",
@@ -443,10 +568,10 @@
             }
         }
     },
-    "TestStructuresAndVariabless_d0g0v0_Metropolis" : {
+    "TestStructuresAndVariabless_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/stSolidityTest/TestStructuresAndVariabless_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -457,19 +582,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x02328d",
-                    "hash" : "0x9826ca8cc312c4c910c8fd6cc4241ca031e61085db4ed09070442bea73f6d972",
-                    "mixHash" : "0x046f7ce5fe45bc1d626c55e6e78dbfe9438c85f88094e245c6fa5440da2df46b",
-                    "nonce" : "0x7dda4855a46f4828",
+                    "gasUsed" : "0x022cb1",
+                    "hash" : "0xe176f0e424239f9bad1b7d9da46b09dd40f298971d8cbb1919550b0879cc541d",
+                    "mixHash" : "0xe1dca326f8c777c0d646f5ef20b765cb3ef315b58ceeceb5bd1107146828a373",
+                    "nonce" : "0xc5ee752432c8f622",
                     "number" : "0x01",
                     "parentHash" : "0x277020daf0b2986de0b53b7af6278659c3460dcd8cd1190e467ee4313afaaf00",
-                    "receiptTrie" : "0xc043cee109033a937fd793c0c4ec439fa29ecdfd8e315252399c51a0dfa5bb7c",
-                    "stateRoot" : "0x7f5b729e5eb2269b7e9066a99baebdf118d6b5c068a17912c304529182353279",
+                    "receiptTrie" : "0x300dd79c4cd80c5a9bc39b861b83ac727d9fa025d21f715c0f211a7669db47fd",
+                    "stateRoot" : "0x71d9d927722831676211f0d5e7047dd780fafc8d32d67807f93de7b16c3eee4d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90269f901fda0277020daf0b2986de0b53b7af6278659c3460dcd8cd1190e467ee4313afaaf00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f5b729e5eb2269b7e9066a99baebdf118d6b5c068a17912c304529182353279a0840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4a0c043cee109033a937fd793c0c4ec439fa29ecdfd8e315252399c51a0dfa5bb7cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8302328d8203e880a0046f7ce5fe45bc1d626c55e6e78dbfe9438c85f88094e245c6fa5440da2df46b887dda4855a46f4828f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba04b5305634acd08c1bdb367bf5e3f44499a16f4157f62241ad9780b31da94af42a057e2df90dc63621d959c8f2d19d15b70b7722d5fb4825348dd710da861e80dafc0",
+                "rlp" : "0xf90269f901fda0277020daf0b2986de0b53b7af6278659c3460dcd8cd1190e467ee4313afaaf00a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa071d9d927722831676211f0d5e7047dd780fafc8d32d67807f93de7b16c3eee4da0840d8d9c81fbde94d0f1e08263bb5d0d6092fb753f24f2072dcf3dc4b0f198f4a0300dd79c4cd80c5a9bc39b861b83ac727d9fa025d21f715c0f211a7669db47fdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83022cb18203e880a0e1dca326f8c777c0d646f5ef20b765cb3ef315b58ceeceb5bd1107146828a37388c5ee752432c8f622f866f86480018305573094095e7baea6a6c7c4c2dfeb977efac326af552d876484c04062261ba04b5305634acd08c1bdb367bf5e3f44499a16f4157f62241ad9780b31da94af42a057e2df90dc63621d959c8f2d19d15b70b7722d5fb4825348dd710da861e80dafc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -506,16 +631,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017e091d8ced26108637c9e9bb797ad52373f24cbdca74f276c02d3b99c845727a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9826ca8cc312c4c910c8fd6cc4241ca031e61085db4ed09070442bea73f6d972",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe176f0e424239f9bad1b7d9da46b09dd40f298971d8cbb1919550b0879cc541d",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x018704",
                 "code" : "0x7c010000000000000000000000000000000000000000000000000000000060003504632a9afb838114610039578063c04062261461004b57005b61004161005d565b8060005260206000f35b61005361016c565b8060005260206000f35b600160ff8154141561006e57610076565b506000610169565b60015460035414156100875761008f565b506000610169565b73a94f5374fce5edbc8e2a8697c15331677e6ebf0b73ffffffffffffffffffffffffffffffffffffffff60016002540481161614156100cd576100d5565b506000610169565b7f676c6f62616c2064617461203332206c656e67746820737472696e670000000060045414156101045761010c565b506000610169565b6005600080815260200190815260200160002060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff1673a94f5374fce5edbc8e2a8697c15331677e6ebf0b141561016057610168565b506000610169565b5b90565b600060ff806001555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b6002805473ffffffffffffffffffffffffffffffffffffffff1916821790555060ff80600355507f676c6f62616c2064617461203332206c656e67746820737472696e6700000000806004555073a94f5374fce5edbc8e2a8697c15331677e6ebf0b6005600080815260200190815260200160002060006101000a81548173ffffffffffffffffffffffffffffffffffffffff0219169083021790555061022f61005d565b600060006101000a81548160ff0219169083021790555060ff6001600054041690509056",
@@ -530,14 +648,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f6328d",
+                "balance" : "0x4563918244f62cb1",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0d0f4f",
+                "balance" : "0x0d152b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {