Hive tests with Byzantine

24 files changed, 4295 insertions, 1401 deletions

diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund50_1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund50_1_d0g0v0.json
index 78a3ecb50..746b5fd62 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund50_1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund50_1_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "refund50_1_d0g0v0_EIP150" : {
+    "refund50_1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x59e7",
-                    "hash" : "0x1c878d76e2a06e963e0cbbc921b225c204597e22ca1e329b533ca9f864e95257",
-                    "mixHash" : "0xef0ecca58e56f3f5c888edaf72973f3e89f95ef0a9b0ed196e6211057387b21b",
-                    "nonce" : "0x157a063439f12cf3",
+                    "hash" : "0xdec6e4e2b651b6ad30a1989967ea1225f05087979f700fc103a172c6d78965e8",
+                    "mixHash" : "0xd18e7ba508377dd51891f3beb04b882ba29e340886bdfc399b8f036017748632",
+                    "nonce" : "0x5c370e4dd1ca7f9f",
                     "number" : "0x01",
                     "parentHash" : "0x44d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0",
-                    "receiptTrie" : "0x570accd13b1cd2f3c3d4a0abd25ddba4d64bb48cfacbd2521d101e4d4d46d5ec",
-                    "stateRoot" : "0xa6d08f38ff2fdd14886e125bfa1979a81eeceb2cb4f78e37fe8ebc9a21c54413",
+                    "receiptTrie" : "0x6c8ab36ec0629c97734e8ac823cdd8397de67efb76c7beb983be73dcd3c78141",
+                    "stateRoot" : "0x502a1b0a5a3920a24d205876621de3ddb424e65dd626a7b2e427fe1dbf434671",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a044d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6d08f38ff2fdd14886e125bfa1979a81eeceb2cb4f78e37fe8ebc9a21c54413a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0570accd13b1cd2f3c3d4a0abd25ddba4d64bb48cfacbd2521d101e4d4d46d5ecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408259e78203e880a0ef0ecca58e56f3f5c888edaf72973f3e89f95ef0a9b0ed196e6211057387b21b88157a063439f12cf3f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a044d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0502a1b0a5a3920a24d205876621de3ddb424e65dd626a7b2e427fe1dbf434671a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a06c8ab36ec0629c97734e8ac823cdd8397de67efb76c7beb983be73dcd3c78141b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408259e78203e880a0d18e7ba508377dd51891f3beb04b882ba29e340886bdfc399b8f036017748632885c370e4dd1ca7f9ff862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aeb02533f639b4a951afda3021b9f1a851d3c2699b18968ab2c8c871670b9c92a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1c878d76e2a06e963e0cbbc921b225c204597e22ca1e329b533ca9f864e95257",
-        "network" : "EIP150",
+        "lastblockhash" : "0xdec6e4e2b651b6ad30a1989967ea1225f05087979f700fc103a172c6d78965e8",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006001556000600255600060035560006004556000600555",
@@ -109,10 +116,10 @@
             }
         }
     },
-    "refund50_1_d0g0v0_EIP158" : {
+    "refund50_1_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -124,18 +131,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x59e7",
-                    "hash" : "0x87ba5e79de7d6e511833e51837feacf807f938df0269a4dd8658a498da974c6c",
-                    "mixHash" : "0x90a35b08045eb80f466105ef2e84c7c56ba4184843cc8532bec9c679cf942c4b",
-                    "nonce" : "0x7924396dc9fd11dd",
+                    "hash" : "0x9a06e6d0a20eb82117ed2985f21f7f006bd3c8932a33dc23b945b215a23a5d09",
+                    "mixHash" : "0x0956e6f8c0d2549afdc7ee3c5c3bbf7f72587615c0899a966149c06de5c61e94",
+                    "nonce" : "0x7c58bcc1942967b9",
                     "number" : "0x01",
                     "parentHash" : "0x44d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0",
-                    "receiptTrie" : "0x570accd13b1cd2f3c3d4a0abd25ddba4d64bb48cfacbd2521d101e4d4d46d5ec",
-                    "stateRoot" : "0xa6d08f38ff2fdd14886e125bfa1979a81eeceb2cb4f78e37fe8ebc9a21c54413",
+                    "receiptTrie" : "0x6c8ab36ec0629c97734e8ac823cdd8397de67efb76c7beb983be73dcd3c78141",
+                    "stateRoot" : "0x502a1b0a5a3920a24d205876621de3ddb424e65dd626a7b2e427fe1dbf434671",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a044d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6d08f38ff2fdd14886e125bfa1979a81eeceb2cb4f78e37fe8ebc9a21c54413a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0570accd13b1cd2f3c3d4a0abd25ddba4d64bb48cfacbd2521d101e4d4d46d5ecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408259e78203e880a090a35b08045eb80f466105ef2e84c7c56ba4184843cc8532bec9c679cf942c4b887924396dc9fd11ddf862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a044d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0502a1b0a5a3920a24d205876621de3ddb424e65dd626a7b2e427fe1dbf434671a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a06c8ab36ec0629c97734e8ac823cdd8397de67efb76c7beb983be73dcd3c78141b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408259e78203e880a00956e6f8c0d2549afdc7ee3c5c3bbf7f72587615c0899a966149c06de5c61e94887c58bcc1942967b9f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -172,9 +179,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aeb02533f639b4a951afda3021b9f1a851d3c2699b18968ab2c8c871670b9c92a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x87ba5e79de7d6e511833e51837feacf807f938df0269a4dd8658a498da974c6c",
-        "network" : "EIP158",
+        "lastblockhash" : "0x9a06e6d0a20eb82117ed2985f21f7f006bd3c8932a33dc23b945b215a23a5d09",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006001556000600255600060035560006004556000600555",
@@ -219,10 +233,10 @@
             }
         }
     },
-    "refund50_1_d0g0v0_Frontier" : {
+    "refund50_1_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -234,9 +248,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x59e7",
-                    "hash" : "0x883bb2c971e3026dd3a80aae313860e2095d604dd3c5401c1a1bfef65296254b",
-                    "mixHash" : "0x27b13e3427ddbca38c5836ac029b4a6785d63669ab34b51c0dbf69f01d604098",
-                    "nonce" : "0xa94add03d510d8b0",
+                    "hash" : "0x949d6c82a152931e67c3b094fc86f05ee5314a78223e7de9a9da32e87f3a6da1",
+                    "mixHash" : "0x7e214fc689fb46b8c69090e96e830da368fda7c460f1ebe204ab1c3f051f827e",
+                    "nonce" : "0xe7689deef8bba532",
                     "number" : "0x01",
                     "parentHash" : "0x44d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0",
                     "receiptTrie" : "0x570accd13b1cd2f3c3d4a0abd25ddba4d64bb48cfacbd2521d101e4d4d46d5ec",
@@ -245,7 +259,7 @@
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a044d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6d08f38ff2fdd14886e125bfa1979a81eeceb2cb4f78e37fe8ebc9a21c54413a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0570accd13b1cd2f3c3d4a0abd25ddba4d64bb48cfacbd2521d101e4d4d46d5ecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408259e78203e880a027b13e3427ddbca38c5836ac029b4a6785d63669ab34b51c0dbf69f01d60409888a94add03d510d8b0f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a044d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6d08f38ff2fdd14886e125bfa1979a81eeceb2cb4f78e37fe8ebc9a21c54413a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0570accd13b1cd2f3c3d4a0abd25ddba4d64bb48cfacbd2521d101e4d4d46d5ecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408259e78203e880a07e214fc689fb46b8c69090e96e830da368fda7c460f1ebe204ab1c3f051f827e88e7689deef8bba532f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -282,8 +296,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aeb02533f639b4a951afda3021b9f1a851d3c2699b18968ab2c8c871670b9c92a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x883bb2c971e3026dd3a80aae313860e2095d604dd3c5401c1a1bfef65296254b",
-        "network" : "Frontier",
+        "lastblockhash" : "0x949d6c82a152931e67c3b094fc86f05ee5314a78223e7de9a9da32e87f3a6da1",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -329,10 +343,10 @@
             }
         }
     },
-    "refund50_1_d0g0v0_Homestead" : {
+    "refund50_1_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -344,9 +358,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x59e7",
-                    "hash" : "0x904b5ae13c94f82992843658cf11c8cc8f3b5b81662daa1bae7e6e4cda9e1942",
-                    "mixHash" : "0x5d0cbd2ebf88ae62c6edf384f7689646e887591d9e06685f06b49177b2f95e30",
-                    "nonce" : "0x0e5b18c0343e1370",
+                    "hash" : "0x0c36f73b3a7a76ed8fcf99f761c44287b3600ae015986a2ad063fed4a7a62cef",
+                    "mixHash" : "0x16501004303c179f291850ae6052e0b137648555759accf611ca305fb3c85dd1",
+                    "nonce" : "0xd3b3310e60c3ca00",
                     "number" : "0x01",
                     "parentHash" : "0x44d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0",
                     "receiptTrie" : "0x570accd13b1cd2f3c3d4a0abd25ddba4d64bb48cfacbd2521d101e4d4d46d5ec",
@@ -355,7 +369,7 @@
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a044d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6d08f38ff2fdd14886e125bfa1979a81eeceb2cb4f78e37fe8ebc9a21c54413a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0570accd13b1cd2f3c3d4a0abd25ddba4d64bb48cfacbd2521d101e4d4d46d5ecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408259e78203e880a05d0cbd2ebf88ae62c6edf384f7689646e887591d9e06685f06b49177b2f95e30880e5b18c0343e1370f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a044d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6d08f38ff2fdd14886e125bfa1979a81eeceb2cb4f78e37fe8ebc9a21c54413a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0570accd13b1cd2f3c3d4a0abd25ddba4d64bb48cfacbd2521d101e4d4d46d5ecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408259e78203e880a016501004303c179f291850ae6052e0b137648555759accf611ca305fb3c85dd188d3b3310e60c3ca00f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -392,8 +406,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aeb02533f639b4a951afda3021b9f1a851d3c2699b18968ab2c8c871670b9c92a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x904b5ae13c94f82992843658cf11c8cc8f3b5b81662daa1bae7e6e4cda9e1942",
-        "network" : "Homestead",
+        "lastblockhash" : "0x0c36f73b3a7a76ed8fcf99f761c44287b3600ae015986a2ad063fed4a7a62cef",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -439,10 +453,10 @@
             }
         }
     },
-    "refund50_1_d0g0v0_Metropolis" : {
+    "refund50_1_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -454,18 +468,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x59e7",
-                    "hash" : "0xafe5b8488b47b3f9edef8f16353475794dff5a880990c1959f27f7d754fd1866",
-                    "mixHash" : "0xaaf776641eff820da46ccb2ff1cf64737780381d6b4dbf6214ba2f22e4698d30",
-                    "nonce" : "0xc5627b58fc8c7622",
+                    "hash" : "0xaa3031f2932fc04795693236f922d9843a6be261a9ccfadf1c195eae79000ec9",
+                    "mixHash" : "0xe18dca0bded59361528834f3476a6820b9bf0cdea0fe646c5f4327b93cf9ff50",
+                    "nonce" : "0x6c42a203b5a344dd",
                     "number" : "0x01",
                     "parentHash" : "0x44d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0",
-                    "receiptTrie" : "0x6c8ab36ec0629c97734e8ac823cdd8397de67efb76c7beb983be73dcd3c78141",
-                    "stateRoot" : "0x502a1b0a5a3920a24d205876621de3ddb424e65dd626a7b2e427fe1dbf434671",
+                    "receiptTrie" : "0x570accd13b1cd2f3c3d4a0abd25ddba4d64bb48cfacbd2521d101e4d4d46d5ec",
+                    "stateRoot" : "0xa6d08f38ff2fdd14886e125bfa1979a81eeceb2cb4f78e37fe8ebc9a21c54413",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a044d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0502a1b0a5a3920a24d205876621de3ddb424e65dd626a7b2e427fe1dbf434671a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a06c8ab36ec0629c97734e8ac823cdd8397de67efb76c7beb983be73dcd3c78141b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408259e78203e880a0aaf776641eff820da46ccb2ff1cf64737780381d6b4dbf6214ba2f22e4698d3088c5627b58fc8c7622f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a044d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6d08f38ff2fdd14886e125bfa1979a81eeceb2cb4f78e37fe8ebc9a21c54413a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0570accd13b1cd2f3c3d4a0abd25ddba4d64bb48cfacbd2521d101e4d4d46d5ecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408259e78203e880a0e18dca0bded59361528834f3476a6820b9bf0cdea0fe646c5f4327b93cf9ff50886c42a203b5a344ddf862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -502,16 +516,119 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aeb02533f639b4a951afda3021b9f1a851d3c2699b18968ab2c8c871670b9c92a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xafe5b8488b47b3f9edef8f16353475794dff5a880990c1959f27f7d754fd1866",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xaa3031f2932fc04795693236f922d9843a6be261a9ccfadf1c195eae79000ec9",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60006001556000600255600060035560006004556000600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f459e7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x012cb9",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60006001556000600255600060035560006004556000600555",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01",
+                    "0x03" : "0x01",
+                    "0x04" : "0x01",
+                    "0x05" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "refund50_1_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50_1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x59e7",
+                    "hash" : "0x7d1449ad5c0db304af9e0f4f1e17f6d26aa2bf393be2b6531fadae14aa7fc584",
+                    "mixHash" : "0x1312ede07ee0814b7e4274b0f7972bac1e26e6a14a16fbeca86360cd27fe51de",
+                    "nonce" : "0x68fb00815e245ac3",
+                    "number" : "0x01",
+                    "parentHash" : "0x44d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0",
+                    "receiptTrie" : "0x570accd13b1cd2f3c3d4a0abd25ddba4d64bb48cfacbd2521d101e4d4d46d5ec",
+                    "stateRoot" : "0xa6d08f38ff2fdd14886e125bfa1979a81eeceb2cb4f78e37fe8ebc9a21c54413",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a044d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6d08f38ff2fdd14886e125bfa1979a81eeceb2cb4f78e37fe8ebc9a21c54413a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0570accd13b1cd2f3c3d4a0abd25ddba4d64bb48cfacbd2521d101e4d4d46d5ecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408259e78203e880a01312ede07ee0814b7e4274b0f7972bac1e26e6a14a16fbeca86360cd27fe51de8868fb00815e245ac3f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0186a0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x44ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6",
+                        "s" : "0x1789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x44d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xaeb02533f639b4a951afda3021b9f1a851d3c2699b18968ab2c8c871670b9c92",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aeb02533f639b4a951afda3021b9f1a851d3c2699b18968ab2c8c871670b9c92a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7d1449ad5c0db304af9e0f4f1e17f6d26aa2bf393be2b6531fadae14aa7fc584",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006001556000600255600060035560006004556000600555",
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund50_2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund50_2_d0g0v0.json
index 644380f88..178296a5c 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund50_2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund50_2_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "refund50_2_d0g0v0_EIP150" : {
+    "refund50_2_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa80d",
-                    "hash" : "0xa8b45f49bea0f10847601b3e106b4827b3333a592f84709b98c3db262c081bcb",
-                    "mixHash" : "0xa6a1b99e2eb3aa6b999cb3d648c4b06c40bd7d66f2229c9cd92b22136ab667d8",
-                    "nonce" : "0xa967fb4cb3523320",
+                    "hash" : "0x54f3fb53619f5a54375fcdc9d94f8a98a01b0336e03ebfdc00f58fd93cdf806f",
+                    "mixHash" : "0x221680ba24c140c1cf36e9557ea8a2c4354b60e2c9b0fd00fd1c103b07447695",
+                    "nonce" : "0x2a359579a4fcaa99",
                     "number" : "0x01",
                     "parentHash" : "0xfefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7",
-                    "receiptTrie" : "0x21f30d3b7761a302dbb167f49c308c40f21e7adff9efe21c2878e98fd037ac15",
-                    "stateRoot" : "0xaa48cde6895623857de5fb9875806f493d3a62d70251225b4f010087f4aecc57",
+                    "receiptTrie" : "0x033163e6c3a8ffa81888536ada16cb63c2d93fc04ab21edc3d7587bce88a54f9",
+                    "stateRoot" : "0x7f813027daae4ddb07adacaac676e728d9031b056b5ac0f86214ad00038c0138",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0fefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa48cde6895623857de5fb9875806f493d3a62d70251225b4f010087f4aecc57a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a021f30d3b7761a302dbb167f49c308c40f21e7adff9efe21c2878e98fd037ac15b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a80d8203e880a0a6a1b99e2eb3aa6b999cb3d648c4b06c40bd7d66f2229c9cd92b22136ab667d888a967fb4cb3523320f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0fefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f813027daae4ddb07adacaac676e728d9031b056b5ac0f86214ad00038c0138a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0033163e6c3a8ffa81888536ada16cb63c2d93fc04ab21edc3d7587bce88a54f9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a80d8203e880a0221680ba24c140c1cf36e9557ea8a2c4354b60e2c9b0fd00fd1c103b07447695882a359579a4fcaa99f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0998c638ddb986ce51957e3164668df171d4cf543c0f5e5d4e7dd938aa17ef31da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa8b45f49bea0f10847601b3e106b4827b3333a592f84709b98c3db262c081bcb",
-        "network" : "EIP150",
+        "lastblockhash" : "0x54f3fb53619f5a54375fcdc9d94f8a98a01b0336e03ebfdc00f58fd93cdf806f",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600a556001600b5560006001556000600255600060035560006004556000600555",
@@ -111,10 +118,10 @@
             }
         }
     },
-    "refund50_2_d0g0v0_EIP158" : {
+    "refund50_2_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -126,18 +133,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa80d",
-                    "hash" : "0xe73eae2b769e68004dda8287353067869b8e9efc9239255590ebaf2ae2b41dd4",
-                    "mixHash" : "0xda0ee119c71ab23c67c0e2dcd412a4b884aa1f96ed88e161fec8ad4a4a1cacb7",
-                    "nonce" : "0xbc764bd45110b514",
+                    "hash" : "0xa1a44bb93dfee71db76a348d19719b0d46e1b6510e0af57ff6fa015288a1f2d6",
+                    "mixHash" : "0xb53707ff7bf6f4234c2ddbd722455ca29a447498f3ae13831054acd6b2754de4",
+                    "nonce" : "0x44b0eab3892197d9",
                     "number" : "0x01",
                     "parentHash" : "0xfefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7",
-                    "receiptTrie" : "0x21f30d3b7761a302dbb167f49c308c40f21e7adff9efe21c2878e98fd037ac15",
-                    "stateRoot" : "0xaa48cde6895623857de5fb9875806f493d3a62d70251225b4f010087f4aecc57",
+                    "receiptTrie" : "0x033163e6c3a8ffa81888536ada16cb63c2d93fc04ab21edc3d7587bce88a54f9",
+                    "stateRoot" : "0x7f813027daae4ddb07adacaac676e728d9031b056b5ac0f86214ad00038c0138",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0fefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa48cde6895623857de5fb9875806f493d3a62d70251225b4f010087f4aecc57a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a021f30d3b7761a302dbb167f49c308c40f21e7adff9efe21c2878e98fd037ac15b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a80d8203e880a0da0ee119c71ab23c67c0e2dcd412a4b884aa1f96ed88e161fec8ad4a4a1cacb788bc764bd45110b514f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0fefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f813027daae4ddb07adacaac676e728d9031b056b5ac0f86214ad00038c0138a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0033163e6c3a8ffa81888536ada16cb63c2d93fc04ab21edc3d7587bce88a54f9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a80d8203e880a0b53707ff7bf6f4234c2ddbd722455ca29a447498f3ae13831054acd6b2754de48844b0eab3892197d9f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -174,9 +181,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0998c638ddb986ce51957e3164668df171d4cf543c0f5e5d4e7dd938aa17ef31da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe73eae2b769e68004dda8287353067869b8e9efc9239255590ebaf2ae2b41dd4",
-        "network" : "EIP158",
+        "lastblockhash" : "0xa1a44bb93dfee71db76a348d19719b0d46e1b6510e0af57ff6fa015288a1f2d6",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600a556001600b5560006001556000600255600060035560006004556000600555",
@@ -223,10 +237,10 @@
             }
         }
     },
-    "refund50_2_d0g0v0_Frontier" : {
+    "refund50_2_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -238,9 +252,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa80d",
-                    "hash" : "0xf3f06f7fff55de15470611d96f25f2335ae158c083c56d898f6382279a03676d",
-                    "mixHash" : "0x1f3652b80bdf25fed8f6c91e0e4550a39213b77ea5c82feea0a606e1403b9c8f",
-                    "nonce" : "0x309a3c0018fab1c1",
+                    "hash" : "0x721be345e51241102acffc35ac3809857615fe64d95f3014bfec9ce5cafa5cd8",
+                    "mixHash" : "0x934929110052abb143aba5c90c16190d9929acca685347e7fa54b12746576f54",
+                    "nonce" : "0x64a052dac0f70e70",
                     "number" : "0x01",
                     "parentHash" : "0xfefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7",
                     "receiptTrie" : "0x21f30d3b7761a302dbb167f49c308c40f21e7adff9efe21c2878e98fd037ac15",
@@ -249,7 +263,7 @@
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0fefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa48cde6895623857de5fb9875806f493d3a62d70251225b4f010087f4aecc57a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a021f30d3b7761a302dbb167f49c308c40f21e7adff9efe21c2878e98fd037ac15b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a80d8203e880a01f3652b80bdf25fed8f6c91e0e4550a39213b77ea5c82feea0a606e1403b9c8f88309a3c0018fab1c1f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0fefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa48cde6895623857de5fb9875806f493d3a62d70251225b4f010087f4aecc57a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a021f30d3b7761a302dbb167f49c308c40f21e7adff9efe21c2878e98fd037ac15b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a80d8203e880a0934929110052abb143aba5c90c16190d9929acca685347e7fa54b12746576f548864a052dac0f70e70f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -286,8 +300,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0998c638ddb986ce51957e3164668df171d4cf543c0f5e5d4e7dd938aa17ef31da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf3f06f7fff55de15470611d96f25f2335ae158c083c56d898f6382279a03676d",
-        "network" : "Frontier",
+        "lastblockhash" : "0x721be345e51241102acffc35ac3809857615fe64d95f3014bfec9ce5cafa5cd8",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -335,10 +349,10 @@
             }
         }
     },
-    "refund50_2_d0g0v0_Homestead" : {
+    "refund50_2_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -350,9 +364,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa80d",
-                    "hash" : "0xd906c6aa97b3d953c098814b164c6962b3c1f83294d401ea887423f7f16d27c1",
-                    "mixHash" : "0xfd23dbc714fae1fd8376f5e70273ba631f46fd3e80e64e22a92a8b8a08a8990f",
-                    "nonce" : "0x177e8c40f9ec3ccf",
+                    "hash" : "0x4a038564b00affa4d154fe3b627e784d2358741d553ccb6b760f69de1aed441a",
+                    "mixHash" : "0xba599f0dfb7a72772bff92654f400460f5fc61ee3b54f0e904cbd859376d98ff",
+                    "nonce" : "0xe9c829c346952b9b",
                     "number" : "0x01",
                     "parentHash" : "0xfefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7",
                     "receiptTrie" : "0x21f30d3b7761a302dbb167f49c308c40f21e7adff9efe21c2878e98fd037ac15",
@@ -361,7 +375,7 @@
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0fefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa48cde6895623857de5fb9875806f493d3a62d70251225b4f010087f4aecc57a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a021f30d3b7761a302dbb167f49c308c40f21e7adff9efe21c2878e98fd037ac15b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a80d8203e880a0fd23dbc714fae1fd8376f5e70273ba631f46fd3e80e64e22a92a8b8a08a8990f88177e8c40f9ec3ccff862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0fefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa48cde6895623857de5fb9875806f493d3a62d70251225b4f010087f4aecc57a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a021f30d3b7761a302dbb167f49c308c40f21e7adff9efe21c2878e98fd037ac15b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a80d8203e880a0ba599f0dfb7a72772bff92654f400460f5fc61ee3b54f0e904cbd859376d98ff88e9c829c346952b9bf862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -398,8 +412,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0998c638ddb986ce51957e3164668df171d4cf543c0f5e5d4e7dd938aa17ef31da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd906c6aa97b3d953c098814b164c6962b3c1f83294d401ea887423f7f16d27c1",
-        "network" : "Homestead",
+        "lastblockhash" : "0x4a038564b00affa4d154fe3b627e784d2358741d553ccb6b760f69de1aed441a",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -447,10 +461,10 @@
             }
         }
     },
-    "refund50_2_d0g0v0_Metropolis" : {
+    "refund50_2_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -462,18 +476,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa80d",
-                    "hash" : "0x82f073b7dea5e93a245d17464ba44f974d30080cad1e523bde2964c5c7b9be9d",
-                    "mixHash" : "0xaf17016697c967670076023afb962e461babb54c4eb01511b2aa338fdae4f3ae",
-                    "nonce" : "0x7d4884d38673e5e8",
+                    "hash" : "0xfcea7f1551911d30a7ea4f2f77486a41a9447b0b03c98022adad9384ebae4874",
+                    "mixHash" : "0xbfcb886e629cbf85ef52f7a25bfee2f69648d7de190dfbcaf083c3030149566e",
+                    "nonce" : "0xf12353f31a87d61d",
                     "number" : "0x01",
                     "parentHash" : "0xfefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7",
-                    "receiptTrie" : "0x033163e6c3a8ffa81888536ada16cb63c2d93fc04ab21edc3d7587bce88a54f9",
-                    "stateRoot" : "0x7f813027daae4ddb07adacaac676e728d9031b056b5ac0f86214ad00038c0138",
+                    "receiptTrie" : "0x21f30d3b7761a302dbb167f49c308c40f21e7adff9efe21c2878e98fd037ac15",
+                    "stateRoot" : "0xaa48cde6895623857de5fb9875806f493d3a62d70251225b4f010087f4aecc57",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0fefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f813027daae4ddb07adacaac676e728d9031b056b5ac0f86214ad00038c0138a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0033163e6c3a8ffa81888536ada16cb63c2d93fc04ab21edc3d7587bce88a54f9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a80d8203e880a0af17016697c967670076023afb962e461babb54c4eb01511b2aa338fdae4f3ae887d4884d38673e5e8f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0fefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa48cde6895623857de5fb9875806f493d3a62d70251225b4f010087f4aecc57a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a021f30d3b7761a302dbb167f49c308c40f21e7adff9efe21c2878e98fd037ac15b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a80d8203e880a0bfcb886e629cbf85ef52f7a25bfee2f69648d7de190dfbcaf083c3030149566e88f12353f31a87d61df862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -510,16 +524,121 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0998c638ddb986ce51957e3164668df171d4cf543c0f5e5d4e7dd938aa17ef31da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x82f073b7dea5e93a245d17464ba44f974d30080cad1e523bde2964c5c7b9be9d",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xfcea7f1551911d30a7ea4f2f77486a41a9447b0b03c98022adad9384ebae4874",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600a556001600b5560006001556000600255600060035560006004556000600555",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x0a" : "0x01",
+                    "0x0b" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4a80d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xde93",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6001600a556001600b5560006001556000600255600060035560006004556000600555",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01",
+                    "0x03" : "0x01",
+                    "0x04" : "0x01",
+                    "0x05" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "refund50_2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50_2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xa80d",
+                    "hash" : "0x1994d560a61875ffe71c205398a53b38fca93eabf5a8d3fd2dede33c3579ef21",
+                    "mixHash" : "0x3e5a23b852621ffd86a17ee90777184664576baf11ccb58c41b4dbf1fe2cd0ac",
+                    "nonce" : "0x39b50351ef64c14c",
+                    "number" : "0x01",
+                    "parentHash" : "0xfefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7",
+                    "receiptTrie" : "0x21f30d3b7761a302dbb167f49c308c40f21e7adff9efe21c2878e98fd037ac15",
+                    "stateRoot" : "0xaa48cde6895623857de5fb9875806f493d3a62d70251225b4f010087f4aecc57",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a0fefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa48cde6895623857de5fb9875806f493d3a62d70251225b4f010087f4aecc57a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a021f30d3b7761a302dbb167f49c308c40f21e7adff9efe21c2878e98fd037ac15b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a80d8203e880a03e5a23b852621ffd86a17ee90777184664576baf11ccb58c41b4dbf1fe2cd0ac8839b50351ef64c14cf862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0186a0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x44ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6",
+                        "s" : "0x1789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xfefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x998c638ddb986ce51957e3164668df171d4cf543c0f5e5d4e7dd938aa17ef31d",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0998c638ddb986ce51957e3164668df171d4cf543c0f5e5d4e7dd938aa17ef31da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1994d560a61875ffe71c205398a53b38fca93eabf5a8d3fd2dede33c3579ef21",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600a556001600b5560006001556000600255600060035560006004556000600555",
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund50percentCap_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund50percentCap_d0g0v0.json
index 3709bc8fc..02603ddea 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund50percentCap_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund50percentCap_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "refund50percentCap_d0g0v0_EIP150" : {
+    "refund50percentCap_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50percentCap_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb2a7",
-                    "hash" : "0x9232269dbf3f4eb73ccfede90ab106d64cb9e7f1ac8f1812578ef044f712c4ea",
-                    "mixHash" : "0x90a46c66975d31d404b62691326c2cbb46d5e99bfac560d37913492879f052e3",
-                    "nonce" : "0x14a76029d1b07658",
+                    "gasUsed" : "0xb2bb",
+                    "hash" : "0xdbf932ced2541aae0f182668475799d2b02443e71f7b08b8ad9a38259ed30564",
+                    "mixHash" : "0x6b52228847790a4257c8df5bd8c9a4edec9abcc1edbe1b35ed085440d4198a55",
+                    "nonce" : "0xa634d394ca36ea68",
                     "number" : "0x01",
                     "parentHash" : "0xbbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1",
-                    "receiptTrie" : "0x6954600f12c7ec8cc5551388a6009bae7177a6d405de8b060a83ac0b98638482",
-                    "stateRoot" : "0x4305d79528182cbdbca413b689dfb7a9380b3016ed0ab7a82a40a5b7b534bd4b",
+                    "receiptTrie" : "0xb38a8503ca34336efb7f39c6f21c270ba2559492d933aad99e09bc0870628de1",
+                    "stateRoot" : "0xed00b4dcfea14503f89ad98f059f059f8232d0273006a4a546a0985a92979b4b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0bbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04305d79528182cbdbca413b689dfb7a9380b3016ed0ab7a82a40a5b7b534bd4ba01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a06954600f12c7ec8cc5551388a6009bae7177a6d405de8b060a83ac0b98638482b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b2a78203e880a090a46c66975d31d404b62691326c2cbb46d5e99bfac560d37913492879f052e38814a76029d1b07658f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0bbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed00b4dcfea14503f89ad98f059f059f8232d0273006a4a546a0985a92979b4ba01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0b38a8503ca34336efb7f39c6f21c270ba2559492d933aad99e09bc0870628de1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b2bb8203e880a06b52228847790a4257c8df5bd8c9a4edec9abcc1edbe1b35ed085440d4198a5588a634d394ca36ea68f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ac040888c74c8463e7a4fff574a7ccff2b114f416d65a0b0f5a3106b75f6040a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9232269dbf3f4eb73ccfede90ab106d64cb9e7f1ac8f1812578ef044f712c4ea",
-        "network" : "EIP150",
+        "lastblockhash" : "0xdbf932ced2541aae0f182668475799d2b02443e71f7b08b8ad9a38259ed30564",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
@@ -75,14 +82,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b2a7",
+                "balance" : "0x4563918244f4b2bb",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xd3f9",
+                "balance" : "0xd3e5",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -112,10 +119,10 @@
             }
         }
     },
-    "refund50percentCap_d0g0v0_EIP158" : {
+    "refund50percentCap_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/stRefundTest/refund50percentCap_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -127,18 +134,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb2bb",
-                    "hash" : "0x80f0e37158acd2fb8ad5593e7a6c4a3c2e0bb3ae545d7d278a9f3a66f37a6af6",
-                    "mixHash" : "0xb270e3ff798c611bb770c51a2a0962257c8ae6ce2a88c47600cacf9da113d752",
-                    "nonce" : "0xfb9622700f4275a9",
+                    "hash" : "0xa2dc0c129670e0fdd36ed79d7fbfd474b08855801f705dda0ef479b4e5b6e039",
+                    "mixHash" : "0xa23373fe9aad6715088c0ef76081813c9e53085b475fc9202f073ee11dae352d",
+                    "nonce" : "0x6a6da078b9f8784f",
                     "number" : "0x01",
                     "parentHash" : "0xbbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1",
-                    "receiptTrie" : "0x73ffc736ec20a7037f9ecc5c272543044f25a1e7536cdfd497abc1964b305e55",
-                    "stateRoot" : "0xc30b2a3bc71484a531530b6089f2dde5f33fae5f0140be373b14191aa68d20de",
+                    "receiptTrie" : "0xb38a8503ca34336efb7f39c6f21c270ba2559492d933aad99e09bc0870628de1",
+                    "stateRoot" : "0xed00b4dcfea14503f89ad98f059f059f8232d0273006a4a546a0985a92979b4b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0bbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c30b2a3bc71484a531530b6089f2dde5f33fae5f0140be373b14191aa68d20dea01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a073ffc736ec20a7037f9ecc5c272543044f25a1e7536cdfd497abc1964b305e55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b2bb8203e880a0b270e3ff798c611bb770c51a2a0962257c8ae6ce2a88c47600cacf9da113d75288fb9622700f4275a9f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0bbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed00b4dcfea14503f89ad98f059f059f8232d0273006a4a546a0985a92979b4ba01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0b38a8503ca34336efb7f39c6f21c270ba2559492d933aad99e09bc0870628de1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b2bb8203e880a0a23373fe9aad6715088c0ef76081813c9e53085b475fc9202f073ee11dae352d886a6da078b9f8784ff862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -175,9 +182,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ac040888c74c8463e7a4fff574a7ccff2b114f416d65a0b0f5a3106b75f6040a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x80f0e37158acd2fb8ad5593e7a6c4a3c2e0bb3ae545d7d278a9f3a66f37a6af6",
-        "network" : "EIP158",
+        "lastblockhash" : "0xa2dc0c129670e0fdd36ed79d7fbfd474b08855801f705dda0ef479b4e5b6e039",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
@@ -225,10 +239,10 @@
             }
         }
     },
-    "refund50percentCap_d0g0v0_Frontier" : {
+    "refund50percentCap_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50percentCap_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -239,19 +253,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb1e9",
-                    "hash" : "0xd2b14017c824f891dd01f4dca311f4f4866366c65d17c3f4bb918ab46ba3a2bc",
-                    "mixHash" : "0x311c9f96f1780a5658e2714795cc73907b4c8c6a6bc62602955947dbf0820d89",
-                    "nonce" : "0x14406b74b1ae5753",
+                    "gasUsed" : "0xb2a7",
+                    "hash" : "0x8651edd83f165e2497293b85dbcc9dff52844c801863cf2aab78dd6b3115ab3a",
+                    "mixHash" : "0x39d4b3d35f8eb1c94428577f1e3077feb3cdd5c5efe3a07fc8185bf88c1437ea",
+                    "nonce" : "0xf152521d6af80ad3",
                     "number" : "0x01",
                     "parentHash" : "0xbbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1",
-                    "receiptTrie" : "0x3ae5a66092a29e80e4d5a8686561286f3b7fca7599164aafa3d7d9ffb0b4ccb8",
-                    "stateRoot" : "0x080df517124156b416981478ebe8673180a891182da9aba054cc5a891a539959",
+                    "receiptTrie" : "0x6954600f12c7ec8cc5551388a6009bae7177a6d405de8b060a83ac0b98638482",
+                    "stateRoot" : "0x4305d79528182cbdbca413b689dfb7a9380b3016ed0ab7a82a40a5b7b534bd4b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0bbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0080df517124156b416981478ebe8673180a891182da9aba054cc5a891a539959a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a03ae5a66092a29e80e4d5a8686561286f3b7fca7599164aafa3d7d9ffb0b4ccb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b1e98203e880a0311c9f96f1780a5658e2714795cc73907b4c8c6a6bc62602955947dbf0820d898814406b74b1ae5753f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0bbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04305d79528182cbdbca413b689dfb7a9380b3016ed0ab7a82a40a5b7b534bd4ba01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a06954600f12c7ec8cc5551388a6009bae7177a6d405de8b060a83ac0b98638482b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b2a78203e880a039d4b3d35f8eb1c94428577f1e3077feb3cdd5c5efe3a07fc8185bf88c1437ea88f152521d6af80ad3f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -288,8 +302,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ac040888c74c8463e7a4fff574a7ccff2b114f416d65a0b0f5a3106b75f6040a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd2b14017c824f891dd01f4dca311f4f4866366c65d17c3f4bb918ab46ba3a2bc",
-        "network" : "Frontier",
+        "lastblockhash" : "0x8651edd83f165e2497293b85dbcc9dff52844c801863cf2aab78dd6b3115ab3a",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -301,14 +315,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b1e9",
+                "balance" : "0x4563918244f4b2a7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xd4b7",
+                "balance" : "0xd3f9",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -338,10 +352,10 @@
             }
         }
     },
-    "refund50percentCap_d0g0v0_Homestead" : {
+    "refund50percentCap_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50percentCap_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -352,19 +366,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb1e9",
-                    "hash" : "0x7d3289379ae6fa23eb24569a9d708e079960919bfcc658ae38e22bfdd7f1159e",
-                    "mixHash" : "0x6d4b011942217fcca7b4c254dbaf186b86f96eb6f64576787bce963af2e55189",
-                    "nonce" : "0x16857eb55b851c9b",
+                    "gasUsed" : "0xb2bb",
+                    "hash" : "0x88e95557a64f3d5b749d64a45c6284206c6100195e61fc210b2921d0c64abb62",
+                    "mixHash" : "0x46664b2d865881f9ba2d442f5e6369b6c8b02edc80ab8a0ec7c5f89a71420d2c",
+                    "nonce" : "0x3374fc914177c830",
                     "number" : "0x01",
                     "parentHash" : "0xbbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1",
-                    "receiptTrie" : "0x3ae5a66092a29e80e4d5a8686561286f3b7fca7599164aafa3d7d9ffb0b4ccb8",
-                    "stateRoot" : "0x080df517124156b416981478ebe8673180a891182da9aba054cc5a891a539959",
+                    "receiptTrie" : "0x73ffc736ec20a7037f9ecc5c272543044f25a1e7536cdfd497abc1964b305e55",
+                    "stateRoot" : "0xc30b2a3bc71484a531530b6089f2dde5f33fae5f0140be373b14191aa68d20de",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0bbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0080df517124156b416981478ebe8673180a891182da9aba054cc5a891a539959a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a03ae5a66092a29e80e4d5a8686561286f3b7fca7599164aafa3d7d9ffb0b4ccb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b1e98203e880a06d4b011942217fcca7b4c254dbaf186b86f96eb6f64576787bce963af2e551898816857eb55b851c9bf862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0bbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c30b2a3bc71484a531530b6089f2dde5f33fae5f0140be373b14191aa68d20dea01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a073ffc736ec20a7037f9ecc5c272543044f25a1e7536cdfd497abc1964b305e55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b2bb8203e880a046664b2d865881f9ba2d442f5e6369b6c8b02edc80ab8a0ec7c5f89a71420d2c883374fc914177c830f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -401,8 +415,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ac040888c74c8463e7a4fff574a7ccff2b114f416d65a0b0f5a3106b75f6040a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7d3289379ae6fa23eb24569a9d708e079960919bfcc658ae38e22bfdd7f1159e",
-        "network" : "Homestead",
+        "lastblockhash" : "0x88e95557a64f3d5b749d64a45c6284206c6100195e61fc210b2921d0c64abb62",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -414,14 +428,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b1e9",
+                "balance" : "0x4563918244f4b2bb",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xd4b7",
+                "balance" : "0xd3e5",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -451,10 +465,10 @@
             }
         }
     },
-    "refund50percentCap_d0g0v0_Metropolis" : {
+    "refund50percentCap_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50percentCap_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -465,19 +479,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb2bb",
-                    "hash" : "0x02e64b726fa4d36be819ea3b2ac45a18462aa84ee407a85712576d41c5f79bb1",
-                    "mixHash" : "0x791314d2f92730de3d6c968f0263d06e21ae241d6e83a7a7246a445ea451d1bf",
-                    "nonce" : "0xaa69f03779749992",
+                    "gasUsed" : "0xb1e9",
+                    "hash" : "0x2cc752a2c1325d6f146ffac4a9817154af17ff88309df9faf3ff757b773dc236",
+                    "mixHash" : "0xaa3a04b02e6f69a961bdf15a39fffb197e863653798f670342defef2e3db509c",
+                    "nonce" : "0xb7c6cb822ce6a7b7",
                     "number" : "0x01",
                     "parentHash" : "0xbbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1",
-                    "receiptTrie" : "0xb38a8503ca34336efb7f39c6f21c270ba2559492d933aad99e09bc0870628de1",
-                    "stateRoot" : "0xed00b4dcfea14503f89ad98f059f059f8232d0273006a4a546a0985a92979b4b",
+                    "receiptTrie" : "0x3ae5a66092a29e80e4d5a8686561286f3b7fca7599164aafa3d7d9ffb0b4ccb8",
+                    "stateRoot" : "0x080df517124156b416981478ebe8673180a891182da9aba054cc5a891a539959",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0bbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed00b4dcfea14503f89ad98f059f059f8232d0273006a4a546a0985a92979b4ba01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0b38a8503ca34336efb7f39c6f21c270ba2559492d933aad99e09bc0870628de1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b2bb8203e880a0791314d2f92730de3d6c968f0263d06e21ae241d6e83a7a7246a445ea451d1bf88aa69f03779749992f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0bbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0080df517124156b416981478ebe8673180a891182da9aba054cc5a891a539959a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a03ae5a66092a29e80e4d5a8686561286f3b7fca7599164aafa3d7d9ffb0b4ccb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b1e98203e880a0aa3a04b02e6f69a961bdf15a39fffb197e863653798f670342defef2e3db509c88b7c6cb822ce6a7b7f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -514,16 +528,122 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ac040888c74c8463e7a4fff574a7ccff2b114f416d65a0b0f5a3106b75f6040a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x02e64b726fa4d36be819ea3b2ac45a18462aa84ee407a85712576d41c5f79bb1",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x2cc752a2c1325d6f146ffac4a9817154af17ff88309df9faf3ff757b773dc236",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x0a" : "0x8000000000000000000000000000000000000000000000000000000000000000",
+                    "0x0b" : "0x0de0b6b3a7640000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4b1e9",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xd4b7",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01",
+                    "0x03" : "0x01",
+                    "0x04" : "0x01",
+                    "0x05" : "0x01",
+                    "0x06" : "0x01"
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "refund50percentCap_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50percentCap_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0xb1e9",
+                    "hash" : "0x06d0b102f898384bb9a488145397e7e8fbcbb8fb76e15da31e31551945ea9199",
+                    "mixHash" : "0xdc9af7ff0bfa7fa3b18d8caefe22ffeb7160c179330a36a567f4fb6947daf0fb",
+                    "nonce" : "0xed4b44a3130da06b",
+                    "number" : "0x01",
+                    "parentHash" : "0xbbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1",
+                    "receiptTrie" : "0x3ae5a66092a29e80e4d5a8686561286f3b7fca7599164aafa3d7d9ffb0b4ccb8",
+                    "stateRoot" : "0x080df517124156b416981478ebe8673180a891182da9aba054cc5a891a539959",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a0bbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0080df517124156b416981478ebe8673180a891182da9aba054cc5a891a539959a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a03ae5a66092a29e80e4d5a8686561286f3b7fca7599164aafa3d7d9ffb0b4ccb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b1e98203e880a0dc9af7ff0bfa7fa3b18d8caefe22ffeb7160c179330a36a567f4fb6947daf0fb88ed4b44a3130da06bf862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0186a0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x44ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6",
+                        "s" : "0x1789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xbbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x4ac040888c74c8463e7a4fff574a7ccff2b114f416d65a0b0f5a3106b75f6040",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ac040888c74c8463e7a4fff574a7ccff2b114f416d65a0b0f5a3106b75f6040a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x06d0b102f898384bb9a488145397e7e8fbcbb8fb76e15da31e31551945ea9199",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
@@ -534,14 +654,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b2bb",
+                "balance" : "0x4563918244f4b1e9",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xd3e5",
+                "balance" : "0xd4b7",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund600_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund600_d0g0v0.json
index 1ef99c0da..737013438 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund600_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund600_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "refund600_d0g0v0_EIP150" : {
+    "refund600_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund600_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x9560",
-                    "hash" : "0xfdeb4d7823f8d50573e7f796263cf4effcec3ef58c5afb1d9c4cda080ce7bddf",
-                    "mixHash" : "0x13375a4dc0324dc9719c22317ab77a4a34cefb95fa59df79546e2c2da45fdeb8",
-                    "nonce" : "0xdacb372e250e5405",
+                    "gasUsed" : "0x9588",
+                    "hash" : "0x7cb2c719670549d2e5490eda6b3c18fe400b5cf2c282ca3f22976b3a335bf7ab",
+                    "mixHash" : "0x007df548a3e21fa85b5070326fdbe253889413c6efdfd61c6e1c877413dea32c",
+                    "nonce" : "0xa95b6e54cfc5c6c0",
                     "number" : "0x01",
                     "parentHash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
-                    "receiptTrie" : "0xac6159a0ed393b347e0d98c8646fe5586d3c818bbb64cd7ad3a023d8ff8cd5a3",
-                    "stateRoot" : "0x119de67a3b9b33d5c61c4519e085e65733a3ff8079c4ce1a0e0a55b0c0ce76bc",
+                    "receiptTrie" : "0x85fcb31b2fc11e7794da2d4bec0e4c52fc3a10f4a60d80ab1ae869e0b1cd50a9",
+                    "stateRoot" : "0x29382d5fb8cabf97a6bb32afb5a5e7c3765dfb44b96e7d0229e870bb1b5d1201",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0d5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0119de67a3b9b33d5c61c4519e085e65733a3ff8079c4ce1a0e0a55b0c0ce76bca01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0ac6159a0ed393b347e0d98c8646fe5586d3c818bbb64cd7ad3a023d8ff8cd5a3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408295608203e880a013375a4dc0324dc9719c22317ab77a4a34cefb95fa59df79546e2c2da45fdeb888dacb372e250e5405f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0d5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029382d5fb8cabf97a6bb32afb5a5e7c3765dfb44b96e7d0229e870bb1b5d1201a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a085fcb31b2fc11e7794da2d4bec0e4c52fc3a10f4a60d80ab1ae869e0b1cd50a9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408295888203e880a0007df548a3e21fa85b5070326fdbe253889413c6efdfd61c6e1c877413dea32c88a95b6e54cfc5c6c0f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfdeb4d7823f8d50573e7f796263cf4effcec3ef58c5afb1d9c4cda080ce7bddf",
-        "network" : "EIP150",
+        "lastblockhash" : "0x7cb2c719670549d2e5490eda6b3c18fe400b5cf2c282ca3f22976b3a335bf7ab",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
@@ -74,14 +81,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49560",
+                "balance" : "0x4563918244f49588",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xf140",
+                "balance" : "0xf118",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -111,10 +118,10 @@
             }
         }
     },
-    "refund600_d0g0v0_EIP158" : {
+    "refund600_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/stRefundTest/refund600_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -126,18 +133,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x9588",
-                    "hash" : "0x8aa0893c8bff425d612db2395e556031a110d76b21cccca256158ce4de56d84e",
-                    "mixHash" : "0xbbee384a776d80386329cc2b120c029c56ab0d925e74269ae0b68da50fb46666",
-                    "nonce" : "0xe17a7c8fbbab498d",
+                    "hash" : "0xbb2324dccb9161d89e5ceb8438208497be701e68358cd32b0814276e736cd45f",
+                    "mixHash" : "0x45aefe001be75af395171d6a9ad3d5b2a9cd220220092b83060c2e5161629a63",
+                    "nonce" : "0xeb61d76d3e36b693",
                     "number" : "0x01",
                     "parentHash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
-                    "receiptTrie" : "0x53636dd66dc734988219e0d6e4af851e1102f44c0e67f39ec78252f9a4672c57",
-                    "stateRoot" : "0x1dc78e28028421ede57e5188f5f85369b631c02eac7d5d8520cf5c0786091897",
+                    "receiptTrie" : "0x85fcb31b2fc11e7794da2d4bec0e4c52fc3a10f4a60d80ab1ae869e0b1cd50a9",
+                    "stateRoot" : "0x29382d5fb8cabf97a6bb32afb5a5e7c3765dfb44b96e7d0229e870bb1b5d1201",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0d5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc78e28028421ede57e5188f5f85369b631c02eac7d5d8520cf5c0786091897a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a053636dd66dc734988219e0d6e4af851e1102f44c0e67f39ec78252f9a4672c57b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408295888203e880a0bbee384a776d80386329cc2b120c029c56ab0d925e74269ae0b68da50fb4666688e17a7c8fbbab498df862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0d5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029382d5fb8cabf97a6bb32afb5a5e7c3765dfb44b96e7d0229e870bb1b5d1201a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a085fcb31b2fc11e7794da2d4bec0e4c52fc3a10f4a60d80ab1ae869e0b1cd50a9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408295888203e880a045aefe001be75af395171d6a9ad3d5b2a9cd220220092b83060c2e5161629a6388eb61d76d3e36b693f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -174,9 +181,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8aa0893c8bff425d612db2395e556031a110d76b21cccca256158ce4de56d84e",
-        "network" : "EIP158",
+        "lastblockhash" : "0xbb2324dccb9161d89e5ceb8438208497be701e68358cd32b0814276e736cd45f",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
@@ -223,10 +237,10 @@
             }
         }
     },
-    "refund600_d0g0v0_Frontier" : {
+    "refund600_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund600_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -237,19 +251,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x94a2",
-                    "hash" : "0xe92b1f9be51b0b794b556413d7701b189c171ddb377a0b6ed2e73d9f06fbc132",
-                    "mixHash" : "0xbb0e8583997d2df76cb8aa1fb7c59ff6c8b958128b7f8c9f5c2cf8ac02c25015",
-                    "nonce" : "0x79cc92af163e5717",
+                    "gasUsed" : "0x9560",
+                    "hash" : "0x9aa1aa15d4fe3db173fc4c4b9f87b8d18377829fe3159035820f7b6188311f9a",
+                    "mixHash" : "0x004ffea2e4137e7b8d6bf3edad4bfd1bfd8001c62cab5c0ba6270d34f5e24ad0",
+                    "nonce" : "0x99629a1457ee06f2",
                     "number" : "0x01",
                     "parentHash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
-                    "receiptTrie" : "0x78e37a040d605d97cb9646d820918e6a4e2d7105f84c9fb48ced73cb2c624c2f",
-                    "stateRoot" : "0xd3423c64816ff9b58f782825c1faa86754a56090a7d69d0ed3da1384510acc0f",
+                    "receiptTrie" : "0xac6159a0ed393b347e0d98c8646fe5586d3c818bbb64cd7ad3a023d8ff8cd5a3",
+                    "stateRoot" : "0x119de67a3b9b33d5c61c4519e085e65733a3ff8079c4ce1a0e0a55b0c0ce76bc",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0d5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d3423c64816ff9b58f782825c1faa86754a56090a7d69d0ed3da1384510acc0fa01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a078e37a040d605d97cb9646d820918e6a4e2d7105f84c9fb48ced73cb2c624c2fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408294a28203e880a0bb0e8583997d2df76cb8aa1fb7c59ff6c8b958128b7f8c9f5c2cf8ac02c250158879cc92af163e5717f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0d5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0119de67a3b9b33d5c61c4519e085e65733a3ff8079c4ce1a0e0a55b0c0ce76bca01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0ac6159a0ed393b347e0d98c8646fe5586d3c818bbb64cd7ad3a023d8ff8cd5a3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408295608203e880a0004ffea2e4137e7b8d6bf3edad4bfd1bfd8001c62cab5c0ba6270d34f5e24ad08899629a1457ee06f2f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -286,8 +300,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe92b1f9be51b0b794b556413d7701b189c171ddb377a0b6ed2e73d9f06fbc132",
-        "network" : "Frontier",
+        "lastblockhash" : "0x9aa1aa15d4fe3db173fc4c4b9f87b8d18377829fe3159035820f7b6188311f9a",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -298,14 +312,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f494a2",
+                "balance" : "0x4563918244f49560",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xf1fe",
+                "balance" : "0xf140",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -335,10 +349,10 @@
             }
         }
     },
-    "refund600_d0g0v0_Homestead" : {
+    "refund600_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund600_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -349,19 +363,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x94a2",
-                    "hash" : "0x6f7790be4d169f3edee7bb024f9c767ebb939c332882ade447e62226086ba9eb",
-                    "mixHash" : "0x8f839bf2cc8860aa43811db6788ab05857741da4daaf1e48633957187332156e",
-                    "nonce" : "0x09ffc99be133f081",
+                    "gasUsed" : "0x9588",
+                    "hash" : "0xb0dff7503f4f4ab6fd8b801ea36947b77236bdf1ca92e524d697e756b0c09e0e",
+                    "mixHash" : "0x0e7694fb7b65caad5110e25db1c6f04b93889b518b4e07052e994b9385ddea77",
+                    "nonce" : "0x8e2efef87b139e35",
                     "number" : "0x01",
                     "parentHash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
-                    "receiptTrie" : "0x78e37a040d605d97cb9646d820918e6a4e2d7105f84c9fb48ced73cb2c624c2f",
-                    "stateRoot" : "0xd3423c64816ff9b58f782825c1faa86754a56090a7d69d0ed3da1384510acc0f",
+                    "receiptTrie" : "0x53636dd66dc734988219e0d6e4af851e1102f44c0e67f39ec78252f9a4672c57",
+                    "stateRoot" : "0x1dc78e28028421ede57e5188f5f85369b631c02eac7d5d8520cf5c0786091897",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0d5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d3423c64816ff9b58f782825c1faa86754a56090a7d69d0ed3da1384510acc0fa01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a078e37a040d605d97cb9646d820918e6a4e2d7105f84c9fb48ced73cb2c624c2fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408294a28203e880a08f839bf2cc8860aa43811db6788ab05857741da4daaf1e48633957187332156e8809ffc99be133f081f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0d5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc78e28028421ede57e5188f5f85369b631c02eac7d5d8520cf5c0786091897a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a053636dd66dc734988219e0d6e4af851e1102f44c0e67f39ec78252f9a4672c57b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408295888203e880a00e7694fb7b65caad5110e25db1c6f04b93889b518b4e07052e994b9385ddea77888e2efef87b139e35f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -398,8 +412,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6f7790be4d169f3edee7bb024f9c767ebb939c332882ade447e62226086ba9eb",
-        "network" : "Homestead",
+        "lastblockhash" : "0xb0dff7503f4f4ab6fd8b801ea36947b77236bdf1ca92e524d697e756b0c09e0e",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -410,14 +424,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f494a2",
+                "balance" : "0x4563918244f49588",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xf1fe",
+                "balance" : "0xf118",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -447,10 +461,10 @@
             }
         }
     },
-    "refund600_d0g0v0_Metropolis" : {
+    "refund600_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund600_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -461,19 +475,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x9588",
-                    "hash" : "0x73046aefd8a4a240014564323c6bffa0717ba81000cb77fce8dd8bb6496df39c",
-                    "mixHash" : "0xc2b1baf5c25ea01b97f72f4c75a3b2becb82341ebc36aeaf9ccd700c23df1775",
-                    "nonce" : "0x68a300ca6de254cb",
+                    "gasUsed" : "0x94a2",
+                    "hash" : "0x56c21b2580f329fa41baf43a6c3aff0949040b4edbe13ac867c099111ce235c3",
+                    "mixHash" : "0x086a34b4e33303ab291fa1107367282b1cec02c68beaf1086b7b2cd74624b3a7",
+                    "nonce" : "0xfbc408bffbe2e5c3",
                     "number" : "0x01",
                     "parentHash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
-                    "receiptTrie" : "0x85fcb31b2fc11e7794da2d4bec0e4c52fc3a10f4a60d80ab1ae869e0b1cd50a9",
-                    "stateRoot" : "0x29382d5fb8cabf97a6bb32afb5a5e7c3765dfb44b96e7d0229e870bb1b5d1201",
+                    "receiptTrie" : "0x78e37a040d605d97cb9646d820918e6a4e2d7105f84c9fb48ced73cb2c624c2f",
+                    "stateRoot" : "0xd3423c64816ff9b58f782825c1faa86754a56090a7d69d0ed3da1384510acc0f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0d5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029382d5fb8cabf97a6bb32afb5a5e7c3765dfb44b96e7d0229e870bb1b5d1201a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a085fcb31b2fc11e7794da2d4bec0e4c52fc3a10f4a60d80ab1ae869e0b1cd50a9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408295888203e880a0c2b1baf5c25ea01b97f72f4c75a3b2becb82341ebc36aeaf9ccd700c23df17758868a300ca6de254cbf862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0d5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d3423c64816ff9b58f782825c1faa86754a56090a7d69d0ed3da1384510acc0fa01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a078e37a040d605d97cb9646d820918e6a4e2d7105f84c9fb48ced73cb2c624c2fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408294a28203e880a0086a34b4e33303ab291fa1107367282b1cec02c68beaf1086b7b2cd74624b3a788fbc408bffbe2e5c3f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -510,16 +524,121 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x73046aefd8a4a240014564323c6bffa0717ba81000cb77fce8dd8bb6496df39c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x56c21b2580f329fa41baf43a6c3aff0949040b4edbe13ac867c099111ce235c3",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x0b" : "0x0de0b6b3a7640000"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f494a2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xf1fe",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01",
+                    "0x03" : "0x01",
+                    "0x04" : "0x01",
+                    "0x05" : "0x01",
+                    "0x06" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "refund600_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund600_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x94a2",
+                    "hash" : "0x0dfae1f5bee251d5674aa73d399cbb42e989ea03daf36da232bee9de2856ce88",
+                    "mixHash" : "0xa5a07987e16619c9085e18e6dbb2ae7237187fe8c11ca837ad101b78c533ab6e",
+                    "nonce" : "0x033602124a67c8bd",
+                    "number" : "0x01",
+                    "parentHash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
+                    "receiptTrie" : "0x78e37a040d605d97cb9646d820918e6a4e2d7105f84c9fb48ced73cb2c624c2f",
+                    "stateRoot" : "0xd3423c64816ff9b58f782825c1faa86754a56090a7d69d0ed3da1384510acc0f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a0d5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d3423c64816ff9b58f782825c1faa86754a56090a7d69d0ed3da1384510acc0fa01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a078e37a040d605d97cb9646d820918e6a4e2d7105f84c9fb48ced73cb2c624c2fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408294a28203e880a0a5a07987e16619c9085e18e6dbb2ae7237187fe8c11ca837ad101b78c533ab6e88033602124a67c8bdf862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x0186a0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x44ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6",
+                        "s" : "0x1789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54e",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0dfae1f5bee251d5674aa73d399cbb42e989ea03daf36da232bee9de2856ce88",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
@@ -529,14 +648,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49588",
+                "balance" : "0x4563918244f494a2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xf118",
+                "balance" : "0xf1fe",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refundSuicide50procentCap_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refundSuicide50procentCap_d0g0v0.json
index 781800dfe..f25242552 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refundSuicide50procentCap_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refundSuicide50procentCap_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "refundSuicide50procentCap_d0g0v0_EIP150" : {
+    "refundSuicide50procentCap_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refundSuicide50procentCap_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf91e",
-                    "hash" : "0x83e3858c95f0eca2bfcab62d5fe2abf427ca5ccba1fd9aa16b9cded684bfbca0",
-                    "mixHash" : "0x53373012cae19ba2d6a4c93ce7eb94e2a1f0e6f0189e351ad3b483479476d600",
-                    "nonce" : "0x9134a501a620b39b",
+                    "hash" : "0xed60473b8a4ac93d51a3c2b3dc0b122f8797173fbb8b03829057f25b36afa75b",
+                    "mixHash" : "0xf256d608ed436a717d938264eda51ee19d66a9d7a453a7c9480888cb4377feaa",
+                    "nonce" : "0xc2a12a0e4f5e7636",
                     "number" : "0x01",
                     "parentHash" : "0xbdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86b",
-                    "receiptTrie" : "0xfe6c263b8c0c67f290121fa77b7e8983d6822602e1054be14dfd1c0d13f37b49",
-                    "stateRoot" : "0xcabaef80ba954eee56e0adc11c5c5a6978f2be108757ae2318364acc1cae8355",
+                    "receiptTrie" : "0xb93612e7a46897ce49cd632e5b99976ab8f830c09b315212bd32eb8ab8311a08",
+                    "stateRoot" : "0xf8c67f38ab7a6934f1c7179abdfdf7e8e4fa10d83513d342f1eb3f3073c68f1f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cabaef80ba954eee56e0adc11c5c5a6978f2be108757ae2318364acc1cae8355a0152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0ba0fe6c263b8c0c67f290121fa77b7e8983d6822602e1054be14dfd1c0d13f37b49b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f91e8203e880a053373012cae19ba2d6a4c93ce7eb94e2a1f0e6f0189e351ad3b483479476d600889134a501a620b39bf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000001f41ba0ca6eed05ee408be0dd60eaf1be4ed39e132fca30191b5d29a1d539f62659ee2da07638bed28aa6eec9d1b8a1a8e96f3fdb7117b2b0412f0804b1cb2f3f3c4f4056c0",
+                "rlp" : "0xf9027ff901f7a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8c67f38ab7a6934f1c7179abdfdf7e8e4fa10d83513d342f1eb3f3073c68f1fa0152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0ba0b93612e7a46897ce49cd632e5b99976ab8f830c09b315212bd32eb8ab8311a08b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f91e8203e880a0f256d608ed436a717d938264eda51ee19d66a9d7a453a7c9480888cb4377feaa88c2a12a0e4f5e7636f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000001f41ba0ca6eed05ee408be0dd60eaf1be4ed39e132fca30191b5d29a1d539f62659ee2da07638bed28aa6eec9d1b8a1a8e96f3fdb7117b2b0412f0804b1cb2f3f3c4f4056c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b26249ae651a11898d83ff3824ce37f6ad82c7e5fb985cc974fba2d5b77d7fb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x83e3858c95f0eca2bfcab62d5fe2abf427ca5ccba1fd9aa16b9cded684bfbca0",
-        "network" : "EIP150",
+        "lastblockhash" : "0xed60473b8a4ac93d51a3c2b3dc0b122f8797173fbb8b03829057f25b36afa75b",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x5a6016556001600a556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600b55600060015560006002556000600355600060045560006005556000600655600060075560006008555a601755",
@@ -129,10 +136,10 @@
             }
         }
     },
-    "refundSuicide50procentCap_d0g0v0_EIP158" : {
+    "refundSuicide50procentCap_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/stRefundTest/refundSuicide50procentCap_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -144,9 +151,146 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf91e",
-                    "hash" : "0x3c8c1ad1bdce83fae24f1c31385e3828e2d262bcd723eadac9153815c7781e02",
-                    "mixHash" : "0x261f5eb807401574e2b6dbd321035c7888a522ab9c0697a0fd5ccbba8926f291",
-                    "nonce" : "0xc4c699fb4c2287cd",
+                    "hash" : "0x775fe02854a27c556c51838d094cab800bf337f5affbd45aa6c91be0e123a764",
+                    "mixHash" : "0x7fb0a673f4abfb262d4493b7da71d9dd94d95b03203288c708bf8ba06b3244c6",
+                    "nonce" : "0xe3b17a0085f608f8",
+                    "number" : "0x01",
+                    "parentHash" : "0xbdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86b",
+                    "receiptTrie" : "0xb93612e7a46897ce49cd632e5b99976ab8f830c09b315212bd32eb8ab8311a08",
+                    "stateRoot" : "0xf8c67f38ab7a6934f1c7179abdfdf7e8e4fa10d83513d342f1eb3f3073c68f1f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9027ff901f7a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8c67f38ab7a6934f1c7179abdfdf7e8e4fa10d83513d342f1eb3f3073c68f1fa0152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0ba0b93612e7a46897ce49cd632e5b99976ab8f830c09b315212bd32eb8ab8311a08b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f91e8203e880a07fb0a673f4abfb262d4493b7da71d9dd94d95b03203288c708bf8ba06b3244c688e3b17a0085f608f8f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000001f41ba0ca6eed05ee408be0dd60eaf1be4ed39e132fca30191b5d29a1d539f62659ee2da07638bed28aa6eec9d1b8a1a8e96f3fdb7117b2b0412f0804b1cb2f3f3c4f4056c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
+                        "gasLimit" : "0x989680",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xca6eed05ee408be0dd60eaf1be4ed39e132fca30191b5d29a1d539f62659ee2d",
+                        "s" : "0x7638bed28aa6eec9d1b8a1a8e96f3fdb7117b2b0412f0804b1cb2f3f3c4f4056",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xbdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb26249ae651a11898d83ff3824ce37f6ad82c7e5fb985cc974fba2d5b77d7fb6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b26249ae651a11898d83ff3824ce37f6ad82c7e5fb985cc974fba2d5b77d7fb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x775fe02854a27c556c51838d094cab800bf337f5affbd45aa6c91be0e123a764",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x5a6016556001600a556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600b55600060015560006002556000600355600060045560006005556000600655600060075560006008555a601755",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x0a" : "0x01",
+                    "0x16" : "0x984376",
+                    "0x17" : "0x96f268"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4f91e",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x979d62",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x5a6016556001600a556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600b55600060015560006002556000600355600060045560006005556000600655600060075560006008555a601755",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01",
+                    "0x03" : "0x01",
+                    "0x04" : "0x01",
+                    "0x05" : "0x01",
+                    "0x06" : "0x01",
+                    "0x07" : "0x01",
+                    "0x08" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x989680",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "refundSuicide50procentCap_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refundSuicide50procentCap_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xf91e",
+                    "hash" : "0x8a6e21b6c3f3b04b850b4e72f4ddaa49846f1ab18e8dfa1440dcf4eee3558514",
+                    "mixHash" : "0x22af19878fe52307b6279166195dbf3648828646b7c01709884431373598aa60",
+                    "nonce" : "0x6dbc7ad41102132c",
                     "number" : "0x01",
                     "parentHash" : "0xbdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86b",
                     "receiptTrie" : "0xfe6c263b8c0c67f290121fa77b7e8983d6822602e1054be14dfd1c0d13f37b49",
@@ -155,7 +299,7 @@
                     "transactionsTrie" : "0x152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cabaef80ba954eee56e0adc11c5c5a6978f2be108757ae2318364acc1cae8355a0152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0ba0fe6c263b8c0c67f290121fa77b7e8983d6822602e1054be14dfd1c0d13f37b49b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f91e8203e880a0261f5eb807401574e2b6dbd321035c7888a522ab9c0697a0fd5ccbba8926f29188c4c699fb4c2287cdf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000001f41ba0ca6eed05ee408be0dd60eaf1be4ed39e132fca30191b5d29a1d539f62659ee2da07638bed28aa6eec9d1b8a1a8e96f3fdb7117b2b0412f0804b1cb2f3f3c4f4056c0",
+                "rlp" : "0xf9027ff901f7a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cabaef80ba954eee56e0adc11c5c5a6978f2be108757ae2318364acc1cae8355a0152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0ba0fe6c263b8c0c67f290121fa77b7e8983d6822602e1054be14dfd1c0d13f37b49b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f91e8203e880a022af19878fe52307b6279166195dbf3648828646b7c01709884431373598aa60886dbc7ad41102132cf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000001f41ba0ca6eed05ee408be0dd60eaf1be4ed39e132fca30191b5d29a1d539f62659ee2da07638bed28aa6eec9d1b8a1a8e96f3fdb7117b2b0412f0804b1cb2f3f3c4f4056c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -192,8 +336,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b26249ae651a11898d83ff3824ce37f6ad82c7e5fb985cc974fba2d5b77d7fb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3c8c1ad1bdce83fae24f1c31385e3828e2d262bcd723eadac9153815c7781e02",
-        "network" : "EIP158",
+        "lastblockhash" : "0x8a6e21b6c3f3b04b850b4e72f4ddaa49846f1ab18e8dfa1440dcf4eee3558514",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -259,10 +403,10 @@
             }
         }
     },
-    "refundSuicide50procentCap_d0g0v0_Frontier" : {
+    "refundSuicide50procentCap_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refundSuicide50procentCap_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -273,19 +417,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x011427",
-                    "hash" : "0xf0b69964a260d443558080835cf7599985da9ecb8f81800de15d38973208ca4c",
-                    "mixHash" : "0xeb371364722d2a20e323820761353bb9024e8a0c24c881318b5bb9ba6daa012b",
-                    "nonce" : "0x3afef729f4055cec",
+                    "gasUsed" : "0xf91e",
+                    "hash" : "0x3053298dc5602e5e580db5cbbd0dcb1a257e9a3374e7736cd5aa36681193c18b",
+                    "mixHash" : "0xd677fadfaefb0607088ca05949fd6f24cb1a5c21ee84dd09995c5b6005889891",
+                    "nonce" : "0x8039074049138321",
                     "number" : "0x01",
                     "parentHash" : "0xbdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86b",
-                    "receiptTrie" : "0xf8ae7fa8d7b2d9440ee8bae82adef9727d2f9b9ea9eb63974fe52963db65b770",
-                    "stateRoot" : "0xb53b6dc50ce7381679719eccbd86d0e1359b83b43ff401ff487cf5b5894e250f",
+                    "receiptTrie" : "0xfe6c263b8c0c67f290121fa77b7e8983d6822602e1054be14dfd1c0d13f37b49",
+                    "stateRoot" : "0xcabaef80ba954eee56e0adc11c5c5a6978f2be108757ae2318364acc1cae8355",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b53b6dc50ce7381679719eccbd86d0e1359b83b43ff401ff487cf5b5894e250fa0152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0ba0f8ae7fa8d7b2d9440ee8bae82adef9727d2f9b9ea9eb63974fe52963db65b770b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830114278203e880a0eb371364722d2a20e323820761353bb9024e8a0c24c881318b5bb9ba6daa012b883afef729f4055cecf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000001f41ba0ca6eed05ee408be0dd60eaf1be4ed39e132fca30191b5d29a1d539f62659ee2da07638bed28aa6eec9d1b8a1a8e96f3fdb7117b2b0412f0804b1cb2f3f3c4f4056c0",
+                "rlp" : "0xf9027ff901f7a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cabaef80ba954eee56e0adc11c5c5a6978f2be108757ae2318364acc1cae8355a0152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0ba0fe6c263b8c0c67f290121fa77b7e8983d6822602e1054be14dfd1c0d13f37b49b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f91e8203e880a0d677fadfaefb0607088ca05949fd6f24cb1a5c21ee84dd09995c5b6005889891888039074049138321f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000001f41ba0ca6eed05ee408be0dd60eaf1be4ed39e132fca30191b5d29a1d539f62659ee2da07638bed28aa6eec9d1b8a1a8e96f3fdb7117b2b0412f0804b1cb2f3f3c4f4056c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -322,33 +466,39 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b26249ae651a11898d83ff3824ce37f6ad82c7e5fb985cc974fba2d5b77d7fb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf0b69964a260d443558080835cf7599985da9ecb8f81800de15d38973208ca4c",
-        "network" : "Frontier",
+        "lastblockhash" : "0x3053298dc5602e5e580db5cbbd0dcb1a257e9a3374e7736cd5aa36681193c18b",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x1bc16d674ec80000",
+                "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x5a6016556001600a556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600b55600060015560006002556000600355600060045560006005556000600655600060075560006008555a601755",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x0a" : "0x01",
-                    "0x0b" : "0x01",
                     "0x16" : "0x984376",
-                    "0x17" : "0x96bc55"
+                    "0x17" : "0x96f268"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51427",
+                "balance" : "0x4563918244f4f91e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x978259",
+                "balance" : "0x979d62",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "pre" : {
@@ -383,10 +533,10 @@
             }
         }
     },
-    "refundSuicide50procentCap_d0g0v0_Homestead" : {
+    "refundSuicide50procentCap_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refundSuicide50procentCap_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -398,9 +548,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011427",
-                    "hash" : "0xff9e8cacd27dfc915122c1a888df58ca705e2fb7ae0a9591ceb2bd35c46b2339",
-                    "mixHash" : "0xc2737b8ab42437130812c8b3b0e6b0e706da25545da80c440b03843dd551bc34",
-                    "nonce" : "0x6419a51309f18f3f",
+                    "hash" : "0x2aa846c891a796cfe9799f2e86380180f8eadfd86e244df593662b20c24d7846",
+                    "mixHash" : "0x00a5e437042c35519f06d627abab68e330658c25f6a388c912e1a82f90c20002",
+                    "nonce" : "0x809a869f079556a4",
                     "number" : "0x01",
                     "parentHash" : "0xbdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86b",
                     "receiptTrie" : "0xf8ae7fa8d7b2d9440ee8bae82adef9727d2f9b9ea9eb63974fe52963db65b770",
@@ -409,7 +559,7 @@
                     "transactionsTrie" : "0x152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b53b6dc50ce7381679719eccbd86d0e1359b83b43ff401ff487cf5b5894e250fa0152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0ba0f8ae7fa8d7b2d9440ee8bae82adef9727d2f9b9ea9eb63974fe52963db65b770b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830114278203e880a0c2737b8ab42437130812c8b3b0e6b0e706da25545da80c440b03843dd551bc34886419a51309f18f3ff882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000001f41ba0ca6eed05ee408be0dd60eaf1be4ed39e132fca30191b5d29a1d539f62659ee2da07638bed28aa6eec9d1b8a1a8e96f3fdb7117b2b0412f0804b1cb2f3f3c4f4056c0",
+                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b53b6dc50ce7381679719eccbd86d0e1359b83b43ff401ff487cf5b5894e250fa0152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0ba0f8ae7fa8d7b2d9440ee8bae82adef9727d2f9b9ea9eb63974fe52963db65b770b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830114278203e880a000a5e437042c35519f06d627abab68e330658c25f6a388c912e1a82f90c2000288809a869f079556a4f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000001f41ba0ca6eed05ee408be0dd60eaf1be4ed39e132fca30191b5d29a1d539f62659ee2da07638bed28aa6eec9d1b8a1a8e96f3fdb7117b2b0412f0804b1cb2f3f3c4f4056c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -446,8 +596,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b26249ae651a11898d83ff3824ce37f6ad82c7e5fb985cc974fba2d5b77d7fb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xff9e8cacd27dfc915122c1a888df58ca705e2fb7ae0a9591ceb2bd35c46b2339",
-        "network" : "Homestead",
+        "lastblockhash" : "0x2aa846c891a796cfe9799f2e86380180f8eadfd86e244df593662b20c24d7846",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec80000",
@@ -507,10 +657,10 @@
             }
         }
     },
-    "refundSuicide50procentCap_d0g0v0_Metropolis" : {
+    "refundSuicide50procentCap_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/stRefundTest/refundSuicide50procentCap_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -521,19 +671,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0xf91e",
-                    "hash" : "0x5b04fcbf6b7a08ee0f50504176c68105548e3bbce808dd57cb5a9b49b170dced",
-                    "mixHash" : "0xdf9efd327b765033f88b5c938a76c29c16b9927366c2f638a1aea07e87aad684",
-                    "nonce" : "0x3a3d41de4ae903fe",
+                    "gasUsed" : "0x011427",
+                    "hash" : "0x71a6d54d42dc7b279750e3ccf93e27ca79faabdad8350faed1aba70062c102f6",
+                    "mixHash" : "0xaa157c6219f589b499696cfa6fd3bd5599210ddd86993f5cca545e6d26afa26b",
+                    "nonce" : "0x16c089a21028d5d3",
                     "number" : "0x01",
                     "parentHash" : "0xbdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86b",
-                    "receiptTrie" : "0xb93612e7a46897ce49cd632e5b99976ab8f830c09b315212bd32eb8ab8311a08",
-                    "stateRoot" : "0xf8c67f38ab7a6934f1c7179abdfdf7e8e4fa10d83513d342f1eb3f3073c68f1f",
+                    "receiptTrie" : "0xf8ae7fa8d7b2d9440ee8bae82adef9727d2f9b9ea9eb63974fe52963db65b770",
+                    "stateRoot" : "0xb53b6dc50ce7381679719eccbd86d0e1359b83b43ff401ff487cf5b5894e250f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8c67f38ab7a6934f1c7179abdfdf7e8e4fa10d83513d342f1eb3f3073c68f1fa0152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0ba0b93612e7a46897ce49cd632e5b99976ab8f830c09b315212bd32eb8ab8311a08b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f91e8203e880a0df9efd327b765033f88b5c938a76c29c16b9927366c2f638a1aea07e87aad684883a3d41de4ae903fef882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000001f41ba0ca6eed05ee408be0dd60eaf1be4ed39e132fca30191b5d29a1d539f62659ee2da07638bed28aa6eec9d1b8a1a8e96f3fdb7117b2b0412f0804b1cb2f3f3c4f4056c0",
+                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b53b6dc50ce7381679719eccbd86d0e1359b83b43ff401ff487cf5b5894e250fa0152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0ba0f8ae7fa8d7b2d9440ee8bae82adef9727d2f9b9ea9eb63974fe52963db65b770b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830114278203e880a0aa157c6219f589b499696cfa6fd3bd5599210ddd86993f5cca545e6d26afa26b8816c089a21028d5d3f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000001f41ba0ca6eed05ee408be0dd60eaf1be4ed39e132fca30191b5d29a1d539f62659ee2da07638bed28aa6eec9d1b8a1a8e96f3fdb7117b2b0412f0804b1cb2f3f3c4f4056c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -570,46 +720,33 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b26249ae651a11898d83ff3824ce37f6ad82c7e5fb985cc974fba2d5b77d7fb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5b04fcbf6b7a08ee0f50504176c68105548e3bbce808dd57cb5a9b49b170dced",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x71a6d54d42dc7b279750e3ccf93e27ca79faabdad8350faed1aba70062c102f6",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
+                "balance" : "0x1bc16d674ec80000",
                 "code" : "0x5a6016556001600a556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600b55600060015560006002556000600355600060045560006005556000600655600060075560006008555a601755",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x0a" : "0x01",
+                    "0x0b" : "0x01",
                     "0x16" : "0x984376",
-                    "0x17" : "0x96f268"
+                    "0x17" : "0x96bc55"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f91e",
+                "balance" : "0x4563918244f51427",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x979d62",
+                "balance" : "0x978259",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
             }
         },
         "pre" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refundSuicide50procentCap_d1g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refundSuicide50procentCap_d1g0v0.json
index 425c68d57..91b552e9c 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refundSuicide50procentCap_d1g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refundSuicide50procentCap_d1g0v0.json
@@ -1,8 +1,8 @@
 {
-    "refundSuicide50procentCap_d1g0v0_EIP150" : {
+    "refundSuicide50procentCap_d1g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refundSuicide50procentCap_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011f15",
-                    "hash" : "0x0f56ef8d164d5a84707b0b17d098ecee7e337a18e346a8d56b1a9620deea6639",
-                    "mixHash" : "0xa2313fcf5953f2c9843c24c2fd7261fa91b2d6f146448cb1fe14a2bc068d98e8",
-                    "nonce" : "0x52953407009e8f7c",
+                    "hash" : "0x109118c08dbbcef735da96765b593238237852ed3dea8fcdd134fa5b2f6fcb75",
+                    "mixHash" : "0x0f6e571651e4b52fbb54d95f8ed16b08d6b532342e1976fb8000b4e868950f6b",
+                    "nonce" : "0x3efd6b53d1b18653",
                     "number" : "0x01",
                     "parentHash" : "0xbdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86b",
-                    "receiptTrie" : "0x30ebdbbdea9639413bf1689f17a99ce2e0e54bf6b917fcb7a5898837bec6a0ac",
-                    "stateRoot" : "0x51f0157a0b69cc801518d78aa12b826f6889d147ee5f69946d5103a7ddb6c833",
+                    "receiptTrie" : "0xc7c04a8e5b16405fd32719819511ef3ab1eabd23cf0b16d382664a32773c5992",
+                    "stateRoot" : "0xc572a8418806a9579adecaaab85fa0a3a388bde4a770a5f9e7c57536153655f9",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051f0157a0b69cc801518d78aa12b826f6889d147ee5f69946d5103a7ddb6c833a08126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810a030ebdbbdea9639413bf1689f17a99ce2e0e54bf6b917fcb7a5898837bec6a0acb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011f158203e880a0a2313fcf5953f2c9843c24c2fd7261fa91b2d6f146448cb1fe14a2bc068d98e88852953407009e8f7cf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000100001ca0f7999e1c73e1c97b1f50c47c01c2e4b7e373d7f7c283212b4384cce240f5b61fa07194855dd81cab147aaefecbcad9ae4af1fd2955975afb6a8b42d8c12a4cd215c0",
+                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c572a8418806a9579adecaaab85fa0a3a388bde4a770a5f9e7c57536153655f9a08126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810a0c7c04a8e5b16405fd32719819511ef3ab1eabd23cf0b16d382664a32773c5992b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011f158203e880a00f6e571651e4b52fbb54d95f8ed16b08d6b532342e1976fb8000b4e868950f6b883efd6b53d1b18653f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000100001ca0f7999e1c73e1c97b1f50c47c01c2e4b7e373d7f7c283212b4384cce240f5b61fa07194855dd81cab147aaefecbcad9ae4af1fd2955975afb6a8b42d8c12a4cd215c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b26249ae651a11898d83ff3824ce37f6ad82c7e5fb985cc974fba2d5b77d7fb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0f56ef8d164d5a84707b0b17d098ecee7e337a18e346a8d56b1a9620deea6639",
-        "network" : "EIP150",
+        "lastblockhash" : "0x109118c08dbbcef735da96765b593238237852ed3dea8fcdd134fa5b2f6fcb75",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec80000",
                 "code" : "0x5a6016556001600a556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600b55600060015560006002556000600355600060045560006005556000600655600060075560006008555a601755",
@@ -123,10 +130,10 @@
             }
         }
     },
-    "refundSuicide50procentCap_d1g0v0_EIP158" : {
+    "refundSuicide50procentCap_d1g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refundSuicide50procentCap_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -138,9 +145,140 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011f15",
-                    "hash" : "0xe38bb5c16ed64594e50aff9cd135b0f9be0e92469088194d20cb69c5f83c879f",
-                    "mixHash" : "0xc3f300c0096813dafaec1403c8e1d326c181b2dcc44d9a1eac13e4507172a560",
-                    "nonce" : "0x3079e46b199106fd",
+                    "hash" : "0x7fe0c9333b314cbfb61096f9228dc31e314ec16a3aafd6b630a6f566eb354bb2",
+                    "mixHash" : "0x3615f04de3d63c022ddf9bc4f9d0ebf905fdf7dc3962bfabbaa3a6e02ada86ea",
+                    "nonce" : "0x80b3d34645ee4b45",
+                    "number" : "0x01",
+                    "parentHash" : "0xbdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86b",
+                    "receiptTrie" : "0xc7c04a8e5b16405fd32719819511ef3ab1eabd23cf0b16d382664a32773c5992",
+                    "stateRoot" : "0xc572a8418806a9579adecaaab85fa0a3a388bde4a770a5f9e7c57536153655f9",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x8126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c572a8418806a9579adecaaab85fa0a3a388bde4a770a5f9e7c57536153655f9a08126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810a0c7c04a8e5b16405fd32719819511ef3ab1eabd23cf0b16d382664a32773c5992b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011f158203e880a03615f04de3d63c022ddf9bc4f9d0ebf905fdf7dc3962bfabbaa3a6e02ada86ea8880b3d34645ee4b45f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000100001ca0f7999e1c73e1c97b1f50c47c01c2e4b7e373d7f7c283212b4384cce240f5b61fa07194855dd81cab147aaefecbcad9ae4af1fd2955975afb6a8b42d8c12a4cd215c0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
+                        "gasLimit" : "0x989680",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf7999e1c73e1c97b1f50c47c01c2e4b7e373d7f7c283212b4384cce240f5b61f",
+                        "s" : "0x7194855dd81cab147aaefecbcad9ae4af1fd2955975afb6a8b42d8c12a4cd215",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xbdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb26249ae651a11898d83ff3824ce37f6ad82c7e5fb985cc974fba2d5b77d7fb6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b26249ae651a11898d83ff3824ce37f6ad82c7e5fb985cc974fba2d5b77d7fb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7fe0c9333b314cbfb61096f9228dc31e314ec16a3aafd6b630a6f566eb354bb2",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x1bc16d674ec80000",
+                "code" : "0x5a6016556001600a556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600b55600060015560006002556000600355600060045560006005556000600655600060075560006008555a601755",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x0a" : "0x01",
+                    "0x0b" : "0x01",
+                    "0x16" : "0x9843b6",
+                    "0x17" : "0x96a679"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f51f15",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x97776b",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x5a6016556001600a556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600b55600060015560006002556000600355600060045560006005556000600655600060075560006008555a601755",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01",
+                    "0x02" : "0x01",
+                    "0x03" : "0x01",
+                    "0x04" : "0x01",
+                    "0x05" : "0x01",
+                    "0x06" : "0x01",
+                    "0x07" : "0x01",
+                    "0x08" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x989680",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "refundSuicide50procentCap_d1g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refundSuicide50procentCap_d1g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x011f15",
+                    "hash" : "0x2494cfb87254ae6acf2ccb1782a939393c798d47dc956cfe2691c7e65a1ee584",
+                    "mixHash" : "0x94f695ba0887b510823a897560b89000fac15f827c7d7da56197ca083cec8382",
+                    "nonce" : "0x69e970eded5c7706",
                     "number" : "0x01",
                     "parentHash" : "0xbdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86b",
                     "receiptTrie" : "0x30ebdbbdea9639413bf1689f17a99ce2e0e54bf6b917fcb7a5898837bec6a0ac",
@@ -149,7 +287,7 @@
                     "transactionsTrie" : "0x8126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051f0157a0b69cc801518d78aa12b826f6889d147ee5f69946d5103a7ddb6c833a08126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810a030ebdbbdea9639413bf1689f17a99ce2e0e54bf6b917fcb7a5898837bec6a0acb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011f158203e880a0c3f300c0096813dafaec1403c8e1d326c181b2dcc44d9a1eac13e4507172a560883079e46b199106fdf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000100001ca0f7999e1c73e1c97b1f50c47c01c2e4b7e373d7f7c283212b4384cce240f5b61fa07194855dd81cab147aaefecbcad9ae4af1fd2955975afb6a8b42d8c12a4cd215c0",
+                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051f0157a0b69cc801518d78aa12b826f6889d147ee5f69946d5103a7ddb6c833a08126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810a030ebdbbdea9639413bf1689f17a99ce2e0e54bf6b917fcb7a5898837bec6a0acb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011f158203e880a094f695ba0887b510823a897560b89000fac15f827c7d7da56197ca083cec83828869e970eded5c7706f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000100001ca0f7999e1c73e1c97b1f50c47c01c2e4b7e373d7f7c283212b4384cce240f5b61fa07194855dd81cab147aaefecbcad9ae4af1fd2955975afb6a8b42d8c12a4cd215c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -186,8 +324,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b26249ae651a11898d83ff3824ce37f6ad82c7e5fb985cc974fba2d5b77d7fb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe38bb5c16ed64594e50aff9cd135b0f9be0e92469088194d20cb69c5f83c879f",
-        "network" : "EIP158",
+        "lastblockhash" : "0x2494cfb87254ae6acf2ccb1782a939393c798d47dc956cfe2691c7e65a1ee584",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec80000",
@@ -247,10 +385,10 @@
             }
         }
     },
-    "refundSuicide50procentCap_d1g0v0_Frontier" : {
+    "refundSuicide50procentCap_d1g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refundSuicide50procentCap_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -261,19 +399,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x011407",
-                    "hash" : "0x34d62692043a222bf744edb6be94288597b8abd25d754f2537eae69e05fc337e",
-                    "mixHash" : "0x3943177e4b60c3e5b77fe1b215c91f0d76f800bf665ad2e1bf645d952060e4d5",
-                    "nonce" : "0xdc1285424b9980bc",
+                    "gasUsed" : "0x011f15",
+                    "hash" : "0xa6bef053f88296f95914d09eedbe43bd727381f21b0fe6298d9c6a3c590f6fb6",
+                    "mixHash" : "0x2f10f754178602c4cc813ae0902a39be2114a1d62c0ec740c168293506f6051c",
+                    "nonce" : "0xe41864c161d8d6fc",
                     "number" : "0x01",
                     "parentHash" : "0xbdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86b",
-                    "receiptTrie" : "0xd5a1184a539450952f2d978df323d8c5deab2f3d971f016f9c029a9c3333f07d",
-                    "stateRoot" : "0xff6bf8d9014efdc103cca37da561f6d872a79fc63d2801ecf0eef5468ef641c1",
+                    "receiptTrie" : "0x30ebdbbdea9639413bf1689f17a99ce2e0e54bf6b917fcb7a5898837bec6a0ac",
+                    "stateRoot" : "0x51f0157a0b69cc801518d78aa12b826f6889d147ee5f69946d5103a7ddb6c833",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff6bf8d9014efdc103cca37da561f6d872a79fc63d2801ecf0eef5468ef641c1a08126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810a0d5a1184a539450952f2d978df323d8c5deab2f3d971f016f9c029a9c3333f07db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830114078203e880a03943177e4b60c3e5b77fe1b215c91f0d76f800bf665ad2e1bf645d952060e4d588dc1285424b9980bcf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000100001ca0f7999e1c73e1c97b1f50c47c01c2e4b7e373d7f7c283212b4384cce240f5b61fa07194855dd81cab147aaefecbcad9ae4af1fd2955975afb6a8b42d8c12a4cd215c0",
+                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051f0157a0b69cc801518d78aa12b826f6889d147ee5f69946d5103a7ddb6c833a08126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810a030ebdbbdea9639413bf1689f17a99ce2e0e54bf6b917fcb7a5898837bec6a0acb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011f158203e880a02f10f754178602c4cc813ae0902a39be2114a1d62c0ec740c168293506f6051c88e41864c161d8d6fcf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000100001ca0f7999e1c73e1c97b1f50c47c01c2e4b7e373d7f7c283212b4384cce240f5b61fa07194855dd81cab147aaefecbcad9ae4af1fd2955975afb6a8b42d8c12a4cd215c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -310,8 +448,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b26249ae651a11898d83ff3824ce37f6ad82c7e5fb985cc974fba2d5b77d7fb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x34d62692043a222bf744edb6be94288597b8abd25d754f2537eae69e05fc337e",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa6bef053f88296f95914d09eedbe43bd727381f21b0fe6298d9c6a3c590f6fb6",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec80000",
@@ -321,18 +459,18 @@
                     "0x0a" : "0x01",
                     "0x0b" : "0x01",
                     "0x16" : "0x9843b6",
-                    "0x17" : "0x96bc95"
+                    "0x17" : "0x96a679"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51407",
+                "balance" : "0x4563918244f51f15",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x978279",
+                "balance" : "0x97776b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -371,10 +509,10 @@
             }
         }
     },
-    "refundSuicide50procentCap_d1g0v0_Homestead" : {
+    "refundSuicide50procentCap_d1g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refundSuicide50procentCap_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -386,9 +524,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011407",
-                    "hash" : "0xbf6512e4daf17a85aa63082b04ebf96fc33afab8621e837a51757a3df4f937b0",
-                    "mixHash" : "0x89d04481bc55f405d331ff40f89b964920cb0e2ab5489cf73dbf2db5485863ce",
-                    "nonce" : "0x09b5c4544ccd1aa1",
+                    "hash" : "0x8d9f6a7b7442a93813ad67ef07d9ec332d7bfc2595d4b37dff64d219efb777b5",
+                    "mixHash" : "0xb7385f77ae753129933f6d9673069a93d708fe9738bf2e59887c9c3e32c037b0",
+                    "nonce" : "0xe429b6393cf283dc",
                     "number" : "0x01",
                     "parentHash" : "0xbdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86b",
                     "receiptTrie" : "0xd5a1184a539450952f2d978df323d8c5deab2f3d971f016f9c029a9c3333f07d",
@@ -397,7 +535,7 @@
                     "transactionsTrie" : "0x8126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff6bf8d9014efdc103cca37da561f6d872a79fc63d2801ecf0eef5468ef641c1a08126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810a0d5a1184a539450952f2d978df323d8c5deab2f3d971f016f9c029a9c3333f07db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830114078203e880a089d04481bc55f405d331ff40f89b964920cb0e2ab5489cf73dbf2db5485863ce8809b5c4544ccd1aa1f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000100001ca0f7999e1c73e1c97b1f50c47c01c2e4b7e373d7f7c283212b4384cce240f5b61fa07194855dd81cab147aaefecbcad9ae4af1fd2955975afb6a8b42d8c12a4cd215c0",
+                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff6bf8d9014efdc103cca37da561f6d872a79fc63d2801ecf0eef5468ef641c1a08126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810a0d5a1184a539450952f2d978df323d8c5deab2f3d971f016f9c029a9c3333f07db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830114078203e880a0b7385f77ae753129933f6d9673069a93d708fe9738bf2e59887c9c3e32c037b088e429b6393cf283dcf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000100001ca0f7999e1c73e1c97b1f50c47c01c2e4b7e373d7f7c283212b4384cce240f5b61fa07194855dd81cab147aaefecbcad9ae4af1fd2955975afb6a8b42d8c12a4cd215c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -434,8 +572,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b26249ae651a11898d83ff3824ce37f6ad82c7e5fb985cc974fba2d5b77d7fb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbf6512e4daf17a85aa63082b04ebf96fc33afab8621e837a51757a3df4f937b0",
-        "network" : "Homestead",
+        "lastblockhash" : "0x8d9f6a7b7442a93813ad67ef07d9ec332d7bfc2595d4b37dff64d219efb777b5",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec80000",
@@ -495,10 +633,10 @@
             }
         }
     },
-    "refundSuicide50procentCap_d1g0v0_Metropolis" : {
+    "refundSuicide50procentCap_d1g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refundSuicide50procentCap_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -509,19 +647,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x011f15",
-                    "hash" : "0x741b3801609db887e939f97ddb2ad286df3a47139c22baa8922ec2d673662305",
-                    "mixHash" : "0x3720c4a358f98610951e56e1ef4392de5fc65653505c115856d96955b37d4cb9",
-                    "nonce" : "0xc62d63a2ca158612",
+                    "gasUsed" : "0x011407",
+                    "hash" : "0xd9cbf773d7afaa403930160f36d5fcc6e6f4d1839d2d44d70946537e0cb7d619",
+                    "mixHash" : "0x7344318cbbb3c7f314b1183b3b95cd95a4cfcdc7a34a1d66a38a7f53a5b2cdc6",
+                    "nonce" : "0x8c601316b5517da3",
                     "number" : "0x01",
                     "parentHash" : "0xbdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86b",
-                    "receiptTrie" : "0xc7c04a8e5b16405fd32719819511ef3ab1eabd23cf0b16d382664a32773c5992",
-                    "stateRoot" : "0xc572a8418806a9579adecaaab85fa0a3a388bde4a770a5f9e7c57536153655f9",
+                    "receiptTrie" : "0xd5a1184a539450952f2d978df323d8c5deab2f3d971f016f9c029a9c3333f07d",
+                    "stateRoot" : "0xff6bf8d9014efdc103cca37da561f6d872a79fc63d2801ecf0eef5468ef641c1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c572a8418806a9579adecaaab85fa0a3a388bde4a770a5f9e7c57536153655f9a08126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810a0c7c04a8e5b16405fd32719819511ef3ab1eabd23cf0b16d382664a32773c5992b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011f158203e880a03720c4a358f98610951e56e1ef4392de5fc65653505c115856d96955b37d4cb988c62d63a2ca158612f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000100001ca0f7999e1c73e1c97b1f50c47c01c2e4b7e373d7f7c283212b4384cce240f5b61fa07194855dd81cab147aaefecbcad9ae4af1fd2955975afb6a8b42d8c12a4cd215c0",
+                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff6bf8d9014efdc103cca37da561f6d872a79fc63d2801ecf0eef5468ef641c1a08126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810a0d5a1184a539450952f2d978df323d8c5deab2f3d971f016f9c029a9c3333f07db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830114078203e880a07344318cbbb3c7f314b1183b3b95cd95a4cfcdc7a34a1d66a38a7f53a5b2cdc6888c601316b5517da3f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000100001ca0f7999e1c73e1c97b1f50c47c01c2e4b7e373d7f7c283212b4384cce240f5b61fa07194855dd81cab147aaefecbcad9ae4af1fd2955975afb6a8b42d8c12a4cd215c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -558,16 +696,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b26249ae651a11898d83ff3824ce37f6ad82c7e5fb985cc974fba2d5b77d7fb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x741b3801609db887e939f97ddb2ad286df3a47139c22baa8922ec2d673662305",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd9cbf773d7afaa403930160f36d5fcc6e6f4d1839d2d44d70946537e0cb7d619",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec80000",
                 "code" : "0x5a6016556001600a556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600b55600060015560006002556000600355600060045560006005556000600655600060075560006008555a601755",
@@ -576,18 +707,18 @@
                     "0x0a" : "0x01",
                     "0x0b" : "0x01",
                     "0x16" : "0x9843b6",
-                    "0x17" : "0x96a679"
+                    "0x17" : "0x96bc95"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51f15",
+                "balance" : "0x4563918244f51407",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x97776b",
+                "balance" : "0x978279",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallA_OOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallA_OOG_d0g0v0.json
index 8e9221fab..9ba199da9 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallA_OOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallA_OOG_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "refund_CallA_OOG_d0g0v0_EIP150" : {
+    "refund_CallA_OOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x795d",
-                    "hash" : "0x8f8c45545defe2c6d53571d25e300652b33b4bba8fd38cf6d18dc0145611b724",
-                    "mixHash" : "0x446cab57625ca133a792bce242be48575dfafc785f0f03e9acf5a340ee79efea",
-                    "nonce" : "0x43ea1af08a73ad5a",
+                    "hash" : "0x75a95a8158b69781916ffa474e539a073f0cf322d05bd487ecfc6a65c18accbb",
+                    "mixHash" : "0x8e7cec9f1b7d38a58715ce0aa7dc1358993f8d199c20a1ea357e148bc7cb53f3",
+                    "nonce" : "0x72dcb0b4d895da5e",
                     "number" : "0x01",
                     "parentHash" : "0xf33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831",
-                    "receiptTrie" : "0x6c7f0aa97089212f779520348e654b541353e552bfb4b2d3e070247c12386311",
-                    "stateRoot" : "0x025413d798caf6577f2c8cce174f9d981789cbc5ebcbfb6690aa189aad8f2826",
+                    "receiptTrie" : "0x71ebbcdbbf242687cad1bcf857b8c155171aa2a89f4eecf0279f1c03fa66434b",
+                    "stateRoot" : "0x1b5b38792fc3ab59b66f95b679c733d4b7c2981e757038c4e77257d16b6971c2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xfc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0025413d798caf6577f2c8cce174f9d981789cbc5ebcbfb6690aa189aad8f2826a0fc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667ba06c7f0aa97089212f779520348e654b541353e552bfb4b2d3e070247c12386311b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a0446cab57625ca133a792bce242be48575dfafc785f0f03e9acf5a340ee79efea8843ea1af08a73ad5af861f85f800182795d94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca07e7cfb9acb7c877739c6991c421e966dcea25fd6f3e915d51f9633d6beb17d7ca02b075bcffec6f5566c35d12679d284ae464ae45f4adc5ea8f9319d6fe10d5df2c0",
+                "rlp" : "0xf9025ef901f7a0f33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5b38792fc3ab59b66f95b679c733d4b7c2981e757038c4e77257d16b6971c2a0fc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667ba071ebbcdbbf242687cad1bcf857b8c155171aa2a89f4eecf0279f1c03fa66434bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a08e7cec9f1b7d38a58715ce0aa7dc1358993f8d199c20a1ea357e148bc7cb53f38872dcb0b4d895da5ef861f85f800182795d94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca07e7cfb9acb7c877739c6991c421e966dcea25fd6f3e915d51f9633d6beb17d7ca02b075bcffec6f5566c35d12679d284ae464ae45f4adc5ea8f9319d6fe10d5df2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e696a428f97033072cba3c1013e6410f104f7e3ae212306538230e69e2c543a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8f8c45545defe2c6d53571d25e300652b33b4bba8fd38cf6d18dc0145611b724",
-        "network" : "EIP150",
+        "lastblockhash" : "0x75a95a8158b69781916ffa474e539a073f0cf322d05bd487ecfc6a65c18accbb",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa611770f1600055",
@@ -122,10 +129,10 @@
             }
         }
     },
-    "refund_CallA_OOG_d0g0v0_EIP158" : {
+    "refund_CallA_OOG_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/stRefundTest/refund_CallA_OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -137,18 +144,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x795d",
-                    "hash" : "0x60fc578f3325731aa52135c1f1d5b9c3fd3d9ab3be6885affc17b874b7544612",
-                    "mixHash" : "0x3d7b268aeec75aebb23bb624a63937dda43a380f108179c381c0f163134a6905",
-                    "nonce" : "0xe099b81d91ba914a",
+                    "hash" : "0x4af19846cc361b42d0f16a57c124840b3d69ca6ecd9c6c2006c59bd2b8aa080c",
+                    "mixHash" : "0x7136c43589ea2737969c406cd3d311f097e55321da0f161354b9cd0889e86a06",
+                    "nonce" : "0x26cd085f501b633d",
                     "number" : "0x01",
                     "parentHash" : "0xf33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831",
-                    "receiptTrie" : "0x6c7f0aa97089212f779520348e654b541353e552bfb4b2d3e070247c12386311",
-                    "stateRoot" : "0x025413d798caf6577f2c8cce174f9d981789cbc5ebcbfb6690aa189aad8f2826",
+                    "receiptTrie" : "0x71ebbcdbbf242687cad1bcf857b8c155171aa2a89f4eecf0279f1c03fa66434b",
+                    "stateRoot" : "0x1b5b38792fc3ab59b66f95b679c733d4b7c2981e757038c4e77257d16b6971c2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xfc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0025413d798caf6577f2c8cce174f9d981789cbc5ebcbfb6690aa189aad8f2826a0fc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667ba06c7f0aa97089212f779520348e654b541353e552bfb4b2d3e070247c12386311b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a03d7b268aeec75aebb23bb624a63937dda43a380f108179c381c0f163134a690588e099b81d91ba914af861f85f800182795d94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca07e7cfb9acb7c877739c6991c421e966dcea25fd6f3e915d51f9633d6beb17d7ca02b075bcffec6f5566c35d12679d284ae464ae45f4adc5ea8f9319d6fe10d5df2c0",
+                "rlp" : "0xf9025ef901f7a0f33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5b38792fc3ab59b66f95b679c733d4b7c2981e757038c4e77257d16b6971c2a0fc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667ba071ebbcdbbf242687cad1bcf857b8c155171aa2a89f4eecf0279f1c03fa66434bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a07136c43589ea2737969c406cd3d311f097e55321da0f161354b9cd0889e86a068826cd085f501b633df861f85f800182795d94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca07e7cfb9acb7c877739c6991c421e966dcea25fd6f3e915d51f9633d6beb17d7ca02b075bcffec6f5566c35d12679d284ae464ae45f4adc5ea8f9319d6fe10d5df2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -185,9 +192,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e696a428f97033072cba3c1013e6410f104f7e3ae212306538230e69e2c543a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x60fc578f3325731aa52135c1f1d5b9c3fd3d9ab3be6885affc17b874b7544612",
-        "network" : "EIP158",
+        "lastblockhash" : "0x4af19846cc361b42d0f16a57c124840b3d69ca6ecd9c6c2006c59bd2b8aa080c",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa611770f1600055",
@@ -245,10 +259,10 @@
             }
         }
     },
-    "refund_CallA_OOG_d0g0v0_Frontier" : {
+    "refund_CallA_OOG_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -260,9 +274,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x795d",
-                    "hash" : "0xff91bdb39588ccae05379d906598141a7db870b468a5533292add4fc2707b0f2",
-                    "mixHash" : "0x756cffa4b6d5eec05a8f14739633f9731764712189958fe098a604d6b9a02916",
-                    "nonce" : "0xb59dc6d4428fa260",
+                    "hash" : "0xca629c9342c0114593e56156078f39df77104ddbec28934260ff22d11cb4e616",
+                    "mixHash" : "0x05037a79c26e0984c0a6183f67fa070605ca65048355d32749481b61d27d0219",
+                    "nonce" : "0xcd2b86ec9ae304fe",
                     "number" : "0x01",
                     "parentHash" : "0xf33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831",
                     "receiptTrie" : "0x6c7f0aa97089212f779520348e654b541353e552bfb4b2d3e070247c12386311",
@@ -271,7 +285,7 @@
                     "transactionsTrie" : "0xfc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0025413d798caf6577f2c8cce174f9d981789cbc5ebcbfb6690aa189aad8f2826a0fc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667ba06c7f0aa97089212f779520348e654b541353e552bfb4b2d3e070247c12386311b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a0756cffa4b6d5eec05a8f14739633f9731764712189958fe098a604d6b9a0291688b59dc6d4428fa260f861f85f800182795d94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca07e7cfb9acb7c877739c6991c421e966dcea25fd6f3e915d51f9633d6beb17d7ca02b075bcffec6f5566c35d12679d284ae464ae45f4adc5ea8f9319d6fe10d5df2c0",
+                "rlp" : "0xf9025ef901f7a0f33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0025413d798caf6577f2c8cce174f9d981789cbc5ebcbfb6690aa189aad8f2826a0fc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667ba06c7f0aa97089212f779520348e654b541353e552bfb4b2d3e070247c12386311b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a005037a79c26e0984c0a6183f67fa070605ca65048355d32749481b61d27d021988cd2b86ec9ae304fef861f85f800182795d94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca07e7cfb9acb7c877739c6991c421e966dcea25fd6f3e915d51f9633d6beb17d7ca02b075bcffec6f5566c35d12679d284ae464ae45f4adc5ea8f9319d6fe10d5df2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -308,8 +322,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e696a428f97033072cba3c1013e6410f104f7e3ae212306538230e69e2c543a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xff91bdb39588ccae05379d906598141a7db870b468a5533292add4fc2707b0f2",
-        "network" : "Frontier",
+        "lastblockhash" : "0xca629c9342c0114593e56156078f39df77104ddbec28934260ff22d11cb4e616",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -368,10 +382,10 @@
             }
         }
     },
-    "refund_CallA_OOG_d0g0v0_Homestead" : {
+    "refund_CallA_OOG_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -383,9 +397,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x795d",
-                    "hash" : "0x435000b02649ee012c91c06b8465cca49e2e6dfd036e85c31e36ea35143c6b53",
-                    "mixHash" : "0x54edf8e14ba77765899d7fcd1d187c0950ddc0beb45b1e61d02f786a8d7551ee",
-                    "nonce" : "0x8a404c79e60f813a",
+                    "hash" : "0x8b5b43215828371769bc9acd4cbd770b03abffaa8a5de4fa51cd6f5ab75dbc10",
+                    "mixHash" : "0x9e772916b860e726fba896bdc98f1082bd76401f66824efc05d991a612e2b5dc",
+                    "nonce" : "0xe1cf2d2c1f86c154",
                     "number" : "0x01",
                     "parentHash" : "0xf33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831",
                     "receiptTrie" : "0x6c7f0aa97089212f779520348e654b541353e552bfb4b2d3e070247c12386311",
@@ -394,7 +408,7 @@
                     "transactionsTrie" : "0xfc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0025413d798caf6577f2c8cce174f9d981789cbc5ebcbfb6690aa189aad8f2826a0fc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667ba06c7f0aa97089212f779520348e654b541353e552bfb4b2d3e070247c12386311b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a054edf8e14ba77765899d7fcd1d187c0950ddc0beb45b1e61d02f786a8d7551ee888a404c79e60f813af861f85f800182795d94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca07e7cfb9acb7c877739c6991c421e966dcea25fd6f3e915d51f9633d6beb17d7ca02b075bcffec6f5566c35d12679d284ae464ae45f4adc5ea8f9319d6fe10d5df2c0",
+                "rlp" : "0xf9025ef901f7a0f33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0025413d798caf6577f2c8cce174f9d981789cbc5ebcbfb6690aa189aad8f2826a0fc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667ba06c7f0aa97089212f779520348e654b541353e552bfb4b2d3e070247c12386311b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a09e772916b860e726fba896bdc98f1082bd76401f66824efc05d991a612e2b5dc88e1cf2d2c1f86c154f861f85f800182795d94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca07e7cfb9acb7c877739c6991c421e966dcea25fd6f3e915d51f9633d6beb17d7ca02b075bcffec6f5566c35d12679d284ae464ae45f4adc5ea8f9319d6fe10d5df2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -431,8 +445,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e696a428f97033072cba3c1013e6410f104f7e3ae212306538230e69e2c543a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x435000b02649ee012c91c06b8465cca49e2e6dfd036e85c31e36ea35143c6b53",
-        "network" : "Homestead",
+        "lastblockhash" : "0x8b5b43215828371769bc9acd4cbd770b03abffaa8a5de4fa51cd6f5ab75dbc10",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -491,10 +505,10 @@
             }
         }
     },
-    "refund_CallA_OOG_d0g0v0_Metropolis" : {
+    "refund_CallA_OOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -506,18 +520,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x795d",
-                    "hash" : "0x5be79b4e48c86586309bb6e6ed51bbb83a56205cf7fd0c0571d1b0aded6af780",
-                    "mixHash" : "0xc60be168cd7309be45f91208b8152ee35edf37f5671b7a00cf615633b9fce619",
-                    "nonce" : "0x7d9472365d26b05e",
+                    "hash" : "0xd172bcaefcd66fd49e8291740904cdd47f14d87a14f23204ae36cc59483ad55e",
+                    "mixHash" : "0xf5131deee4505fb484e8dfb2267090adec0f8b3d1aec8ff0e408aad879c1dcc0",
+                    "nonce" : "0x8f62e4a647d6ce45",
                     "number" : "0x01",
                     "parentHash" : "0xf33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831",
-                    "receiptTrie" : "0x71ebbcdbbf242687cad1bcf857b8c155171aa2a89f4eecf0279f1c03fa66434b",
-                    "stateRoot" : "0x1b5b38792fc3ab59b66f95b679c733d4b7c2981e757038c4e77257d16b6971c2",
+                    "receiptTrie" : "0x6c7f0aa97089212f779520348e654b541353e552bfb4b2d3e070247c12386311",
+                    "stateRoot" : "0x025413d798caf6577f2c8cce174f9d981789cbc5ebcbfb6690aa189aad8f2826",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xfc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5b38792fc3ab59b66f95b679c733d4b7c2981e757038c4e77257d16b6971c2a0fc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667ba071ebbcdbbf242687cad1bcf857b8c155171aa2a89f4eecf0279f1c03fa66434bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a0c60be168cd7309be45f91208b8152ee35edf37f5671b7a00cf615633b9fce619887d9472365d26b05ef861f85f800182795d94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca07e7cfb9acb7c877739c6991c421e966dcea25fd6f3e915d51f9633d6beb17d7ca02b075bcffec6f5566c35d12679d284ae464ae45f4adc5ea8f9319d6fe10d5df2c0",
+                "rlp" : "0xf9025ef901f7a0f33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0025413d798caf6577f2c8cce174f9d981789cbc5ebcbfb6690aa189aad8f2826a0fc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667ba06c7f0aa97089212f779520348e654b541353e552bfb4b2d3e070247c12386311b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a0f5131deee4505fb484e8dfb2267090adec0f8b3d1aec8ff0e408aad879c1dcc0888f62e4a647d6ce45f861f85f800182795d94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca07e7cfb9acb7c877739c6991c421e966dcea25fd6f3e915d51f9633d6beb17d7ca02b075bcffec6f5566c35d12679d284ae464ae45f4adc5ea8f9319d6fe10d5df2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -554,16 +568,132 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e696a428f97033072cba3c1013e6410f104f7e3ae212306538230e69e2c543a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5be79b4e48c86586309bb6e6ed51bbb83a56205cf7fd0c0571d1b0aded6af780",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd172bcaefcd66fd49e8291740904cdd47f14d87a14f23204ae36cc59483ad55e",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa611770f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4795d",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x041a83",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa611770f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0493e0",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        }
+    },
+    "refund_CallA_OOG_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_OOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x795d",
+                    "hash" : "0xcc2cd74f79f4a011b197f743b0c5254011d55f820ec444bbdd81896dbd6acf42",
+                    "mixHash" : "0xd75371a6abb8257c603feabf4b5fdd522c98186db0a29e096d57abb049ca96f3",
+                    "nonce" : "0xdec04915d129e0e8",
+                    "number" : "0x01",
+                    "parentHash" : "0xf33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831",
+                    "receiptTrie" : "0x6c7f0aa97089212f779520348e654b541353e552bfb4b2d3e070247c12386311",
+                    "stateRoot" : "0x025413d798caf6577f2c8cce174f9d981789cbc5ebcbfb6690aa189aad8f2826",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xfc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a0f33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0025413d798caf6577f2c8cce174f9d981789cbc5ebcbfb6690aa189aad8f2826a0fc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667ba06c7f0aa97089212f779520348e654b541353e552bfb4b2d3e070247c12386311b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a0d75371a6abb8257c603feabf4b5fdd522c98186db0a29e096d57abb049ca96f388dec04915d129e0e8f861f85f800182795d94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca07e7cfb9acb7c877739c6991c421e966dcea25fd6f3e915d51f9633d6beb17d7ca02b075bcffec6f5566c35d12679d284ae464ae45f4adc5ea8f9319d6fe10d5df2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x795d",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7e7cfb9acb7c877739c6991c421e966dcea25fd6f3e915d51f9633d6beb17d7c",
+                        "s" : "0x2b075bcffec6f5566c35d12679d284ae464ae45f4adc5ea8f9319d6fe10d5df2",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xf33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa3e696a428f97033072cba3c1013e6410f104f7e3ae212306538230e69e2c543",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e696a428f97033072cba3c1013e6410f104f7e3ae212306538230e69e2c543a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcc2cd74f79f4a011b197f743b0c5254011d55f820ec444bbdd81896dbd6acf42",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa611770f1600055",
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallA_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallA_d0g0v0.json
index cd9a67733..66d5a3a8c 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallA_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallA_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "refund_CallA_d0g0v0_EIP150" : {
+    "refund_CallA_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x7bf2",
-                    "hash" : "0xa0ca3558992e7c5fe2bb7f41aff6dda4b3f49bc93adf82f29a7377766caaf453",
-                    "mixHash" : "0xf1fd62a43dfe449d6f0229ff54fb7d94551ab41fd6d9e78c3d849acd2307fbf2",
-                    "nonce" : "0xad7fb8abd7f5e016",
+                    "hash" : "0x00ead98c5a6c149f38e8fe49d85384b50a9491167f679f1c5d8a406fc7dc7234",
+                    "mixHash" : "0x9b3aad8ba3f2bd95e876ee9fae57517bd594f42895ed489187977afd2524cd98",
+                    "nonce" : "0xfb578a709718c2f7",
                     "number" : "0x01",
                     "parentHash" : "0x417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953",
-                    "receiptTrie" : "0x1ccce45ab6a9d6e666b9f00a67822b65e8d30243af4733d1db59eb3c66655c37",
-                    "stateRoot" : "0x3dd549638735fb2160ccf195863120a4ac67c43a8e2595bde237736b2a354781",
+                    "receiptTrie" : "0x089f0c9e29a7ce65e0d065a95e6b18f035d5b9060e68f3909bc5270ce221f19b",
+                    "stateRoot" : "0xd748aabb62702c9be173876658e3814298de8ece927fafee870d8f0ff1e42c37",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03dd549638735fb2160ccf195863120a4ac67c43a8e2595bde237736b2a354781a0695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655ba01ccce45ab6a9d6e666b9f00a67822b65e8d30243af4733d1db59eb3c66655c37b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf28203e880a0f1fd62a43dfe449d6f0229ff54fb7d94551ab41fd6d9e78c3d849acd2307fbf288ad7fb8abd7f5e016f862f860800183030d4094095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca0c65220d22ee9533e69ca0cca4f2d90dbabd0db71e86883dda79a6135a896c6c2a0148c872a3758db30e6cff63d5f8c1155bdf13d9a39bf993b42d3f2cc7a0c568ac0",
+                "rlp" : "0xf9025ff901f7a0417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d748aabb62702c9be173876658e3814298de8ece927fafee870d8f0ff1e42c37a0695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655ba0089f0c9e29a7ce65e0d065a95e6b18f035d5b9060e68f3909bc5270ce221f19bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf28203e880a09b3aad8ba3f2bd95e876ee9fae57517bd594f42895ed489187977afd2524cd9888fb578a709718c2f7f862f860800183030d4094095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca0c65220d22ee9533e69ca0cca4f2d90dbabd0db71e86883dda79a6135a896c6c2a0148c872a3758db30e6cff63d5f8c1155bdf13d9a39bf993b42d3f2cc7a0c568ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa068ac7c65a3a31b7d8be621d99d2f227701585de873dbdaa2b5f8d74be15af1b2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa0ca3558992e7c5fe2bb7f41aff6dda4b3f49bc93adf82f29a7377766caaf453",
-        "network" : "EIP150",
+        "lastblockhash" : "0x00ead98c5a6c149f38e8fe49d85384b50a9491167f679f1c5d8a406fc7dc7234",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa61157cf1600055",
@@ -122,10 +129,140 @@
             }
         }
     },
-    "refund_CallA_d0g0v0_EIP158" : {
+    "refund_CallA_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x7bf2",
+                    "hash" : "0xd53b2788cd645fa2bea2441e94946e5c8e1af8ce50522722a0f55590242c6611",
+                    "mixHash" : "0x0c8b5cfb7dbe1ceb7ee235574201bf80b711e250a81327387f13557ef52d5d88",
+                    "nonce" : "0x673419ccc3f69a7b",
+                    "number" : "0x01",
+                    "parentHash" : "0x417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953",
+                    "receiptTrie" : "0x089f0c9e29a7ce65e0d065a95e6b18f035d5b9060e68f3909bc5270ce221f19b",
+                    "stateRoot" : "0xd748aabb62702c9be173876658e3814298de8ece927fafee870d8f0ff1e42c37",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a0417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d748aabb62702c9be173876658e3814298de8ece927fafee870d8f0ff1e42c37a0695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655ba0089f0c9e29a7ce65e0d065a95e6b18f035d5b9060e68f3909bc5270ce221f19bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf28203e880a00c8b5cfb7dbe1ceb7ee235574201bf80b711e250a81327387f13557ef52d5d8888673419ccc3f69a7bf862f860800183030d4094095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca0c65220d22ee9533e69ca0cca4f2d90dbabd0db71e86883dda79a6135a896c6c2a0148c872a3758db30e6cff63d5f8c1155bdf13d9a39bf993b42d3f2cc7a0c568ac0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x030d40",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc65220d22ee9533e69ca0cca4f2d90dbabd0db71e86883dda79a6135a896c6c2",
+                        "s" : "0x148c872a3758db30e6cff63d5f8c1155bdf13d9a39bf993b42d3f2cc7a0c568a",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x68ac7c65a3a31b7d8be621d99d2f227701585de873dbdaa2b5f8d74be15af1b2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa068ac7c65a3a31b7d8be621d99d2f227701585de873dbdaa2b5f8d74be15af1b2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd53b2788cd645fa2bea2441e94946e5c8e1af8ce50522722a0f55590242c6611",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa61157cf1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f47bf2",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1e0884",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa61157cf1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1e8480",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        }
+    },
+    "refund_CallA_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -137,9 +274,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x7bf2",
-                    "hash" : "0x93336010151be7a1f1b6a06bfaa012feb0e22c7d1f5091dd248322fd8bc8b384",
-                    "mixHash" : "0x983a6cf570023e834dc140127f1e71e5212702fb708dbff36884fbcff4abcce0",
-                    "nonce" : "0x4489d7b0e98699b3",
+                    "hash" : "0xdfaff700e5082ed3e9fa886de72337ad961969f6863299e218ed54b2b8b88863",
+                    "mixHash" : "0x6e8aa07fb452fe48fb812cfc8cefefd4966705593b796a04b551527e64fafbbf",
+                    "nonce" : "0xb5ea4fcef0b1074e",
                     "number" : "0x01",
                     "parentHash" : "0x417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953",
                     "receiptTrie" : "0x1ccce45ab6a9d6e666b9f00a67822b65e8d30243af4733d1db59eb3c66655c37",
@@ -148,7 +285,7 @@
                     "transactionsTrie" : "0x695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03dd549638735fb2160ccf195863120a4ac67c43a8e2595bde237736b2a354781a0695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655ba01ccce45ab6a9d6e666b9f00a67822b65e8d30243af4733d1db59eb3c66655c37b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf28203e880a0983a6cf570023e834dc140127f1e71e5212702fb708dbff36884fbcff4abcce0884489d7b0e98699b3f862f860800183030d4094095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca0c65220d22ee9533e69ca0cca4f2d90dbabd0db71e86883dda79a6135a896c6c2a0148c872a3758db30e6cff63d5f8c1155bdf13d9a39bf993b42d3f2cc7a0c568ac0",
+                "rlp" : "0xf9025ff901f7a0417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03dd549638735fb2160ccf195863120a4ac67c43a8e2595bde237736b2a354781a0695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655ba01ccce45ab6a9d6e666b9f00a67822b65e8d30243af4733d1db59eb3c66655c37b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf28203e880a06e8aa07fb452fe48fb812cfc8cefefd4966705593b796a04b551527e64fafbbf88b5ea4fcef0b1074ef862f860800183030d4094095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca0c65220d22ee9533e69ca0cca4f2d90dbabd0db71e86883dda79a6135a896c6c2a0148c872a3758db30e6cff63d5f8c1155bdf13d9a39bf993b42d3f2cc7a0c568ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -185,8 +322,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa068ac7c65a3a31b7d8be621d99d2f227701585de873dbdaa2b5f8d74be15af1b2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x93336010151be7a1f1b6a06bfaa012feb0e22c7d1f5091dd248322fd8bc8b384",
-        "network" : "EIP158",
+        "lastblockhash" : "0xdfaff700e5082ed3e9fa886de72337ad961969f6863299e218ed54b2b8b88863",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -245,10 +382,10 @@
             }
         }
     },
-    "refund_CallA_d0g0v0_Frontier" : {
+    "refund_CallA_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -259,19 +396,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x795e",
-                    "hash" : "0x5f1d50d1a17abcc8e9ed78455ab953f7cc19fdc92eb8e58d91c2fde42b617221",
-                    "mixHash" : "0x59187df5d609a65bfa6c5bbca271f3347460ec62c5cd16d2794e0fec71ae274f",
-                    "nonce" : "0xc3916d71a98ba19e",
+                    "gasUsed" : "0x7bf2",
+                    "hash" : "0xf2482b580bf9ae74245427ee78c7c4dfdf39442984faec1961d40b5d9ec02df7",
+                    "mixHash" : "0x75a495a63f89077b703a1165b460f8999ecb08ab4af8769977e783255da19361",
+                    "nonce" : "0xff879e6c0d4b476b",
                     "number" : "0x01",
                     "parentHash" : "0x417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953",
-                    "receiptTrie" : "0xe76b86ccbec5399176a16dc8e3cbc3a936db1b328e7a55a09c4328c54b7d2f18",
-                    "stateRoot" : "0x8f513fa246e67ac0c2884bbdac76260a16224e0dc4fff830bb1def9e261c9181",
+                    "receiptTrie" : "0x1ccce45ab6a9d6e666b9f00a67822b65e8d30243af4733d1db59eb3c66655c37",
+                    "stateRoot" : "0x3dd549638735fb2160ccf195863120a4ac67c43a8e2595bde237736b2a354781",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08f513fa246e67ac0c2884bbdac76260a16224e0dc4fff830bb1def9e261c9181a0695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655ba0e76b86ccbec5399176a16dc8e3cbc3a936db1b328e7a55a09c4328c54b7d2f18b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795e8203e880a059187df5d609a65bfa6c5bbca271f3347460ec62c5cd16d2794e0fec71ae274f88c3916d71a98ba19ef862f860800183030d4094095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca0c65220d22ee9533e69ca0cca4f2d90dbabd0db71e86883dda79a6135a896c6c2a0148c872a3758db30e6cff63d5f8c1155bdf13d9a39bf993b42d3f2cc7a0c568ac0",
+                "rlp" : "0xf9025ff901f7a0417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03dd549638735fb2160ccf195863120a4ac67c43a8e2595bde237736b2a354781a0695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655ba01ccce45ab6a9d6e666b9f00a67822b65e8d30243af4733d1db59eb3c66655c37b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf28203e880a075a495a63f89077b703a1165b460f8999ecb08ab4af8769977e783255da1936188ff879e6c0d4b476bf862f860800183030d4094095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca0c65220d22ee9533e69ca0cca4f2d90dbabd0db71e86883dda79a6135a896c6c2a0148c872a3758db30e6cff63d5f8c1155bdf13d9a39bf993b42d3f2cc7a0c568ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -308,8 +445,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa068ac7c65a3a31b7d8be621d99d2f227701585de873dbdaa2b5f8d74be15af1b2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5f1d50d1a17abcc8e9ed78455ab953f7cc19fdc92eb8e58d91c2fde42b617221",
-        "network" : "Frontier",
+        "lastblockhash" : "0xf2482b580bf9ae74245427ee78c7c4dfdf39442984faec1961d40b5d9ec02df7",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -321,14 +458,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4795e",
+                "balance" : "0x4563918244f47bf2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1e0b18",
+                "balance" : "0x1e0884",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -368,10 +505,10 @@
             }
         }
     },
-    "refund_CallA_d0g0v0_Homestead" : {
+    "refund_CallA_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -383,9 +520,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x795e",
-                    "hash" : "0xecb976cdea800e8bd33e18fd8fb65d648861f9b5d95be4c8b8b12853693caa52",
-                    "mixHash" : "0xa94b7e48e41138c0ad8355dcd7c5c88c0f14b175817f10b17de36ae71c9f08a5",
-                    "nonce" : "0x195ea865ce9d8d28",
+                    "hash" : "0x972bff7339ad944efb33925f68588c2f8df429b2c58be3c11f377cab31977acb",
+                    "mixHash" : "0xcf893c1f60509d4ac13e668d3e66aa76d8ad8bb6e790d54e1321a733cc1288b6",
+                    "nonce" : "0x5478129f288abd8e",
                     "number" : "0x01",
                     "parentHash" : "0x417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953",
                     "receiptTrie" : "0xe76b86ccbec5399176a16dc8e3cbc3a936db1b328e7a55a09c4328c54b7d2f18",
@@ -394,7 +531,7 @@
                     "transactionsTrie" : "0x695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08f513fa246e67ac0c2884bbdac76260a16224e0dc4fff830bb1def9e261c9181a0695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655ba0e76b86ccbec5399176a16dc8e3cbc3a936db1b328e7a55a09c4328c54b7d2f18b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795e8203e880a0a94b7e48e41138c0ad8355dcd7c5c88c0f14b175817f10b17de36ae71c9f08a588195ea865ce9d8d28f862f860800183030d4094095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca0c65220d22ee9533e69ca0cca4f2d90dbabd0db71e86883dda79a6135a896c6c2a0148c872a3758db30e6cff63d5f8c1155bdf13d9a39bf993b42d3f2cc7a0c568ac0",
+                "rlp" : "0xf9025ff901f7a0417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08f513fa246e67ac0c2884bbdac76260a16224e0dc4fff830bb1def9e261c9181a0695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655ba0e76b86ccbec5399176a16dc8e3cbc3a936db1b328e7a55a09c4328c54b7d2f18b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795e8203e880a0cf893c1f60509d4ac13e668d3e66aa76d8ad8bb6e790d54e1321a733cc1288b6885478129f288abd8ef862f860800183030d4094095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca0c65220d22ee9533e69ca0cca4f2d90dbabd0db71e86883dda79a6135a896c6c2a0148c872a3758db30e6cff63d5f8c1155bdf13d9a39bf993b42d3f2cc7a0c568ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -431,8 +568,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa068ac7c65a3a31b7d8be621d99d2f227701585de873dbdaa2b5f8d74be15af1b2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xecb976cdea800e8bd33e18fd8fb65d648861f9b5d95be4c8b8b12853693caa52",
-        "network" : "Homestead",
+        "lastblockhash" : "0x972bff7339ad944efb33925f68588c2f8df429b2c58be3c11f377cab31977acb",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -491,10 +628,10 @@
             }
         }
     },
-    "refund_CallA_d0g0v0_Metropolis" : {
+    "refund_CallA_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/stRefundTest/refund_CallA_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -505,19 +642,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x7bf2",
-                    "hash" : "0xa9ecaa730290e3fe965838adcc2b89b359d9d0a279aadcabaefc9e132dcdfdfb",
-                    "mixHash" : "0xe0ef1af643a668b6570a2a7e7ac92bfb6f7b7337f4e88fe4b1c87f1756a288bd",
-                    "nonce" : "0x5aafb0b061fcb2df",
+                    "gasUsed" : "0x795e",
+                    "hash" : "0x35c98cf5cd9c389c6f8b431a7c51baf7499b981031f1eccac9d6400aee50ce4f",
+                    "mixHash" : "0xfc1952b55031f7b176f9c2d6b943cc7e70704afa6984f208264b26db7fe633c6",
+                    "nonce" : "0xdfb777290f3c9bc8",
                     "number" : "0x01",
                     "parentHash" : "0x417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953",
-                    "receiptTrie" : "0x089f0c9e29a7ce65e0d065a95e6b18f035d5b9060e68f3909bc5270ce221f19b",
-                    "stateRoot" : "0xd748aabb62702c9be173876658e3814298de8ece927fafee870d8f0ff1e42c37",
+                    "receiptTrie" : "0xe76b86ccbec5399176a16dc8e3cbc3a936db1b328e7a55a09c4328c54b7d2f18",
+                    "stateRoot" : "0x8f513fa246e67ac0c2884bbdac76260a16224e0dc4fff830bb1def9e261c9181",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d748aabb62702c9be173876658e3814298de8ece927fafee870d8f0ff1e42c37a0695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655ba0089f0c9e29a7ce65e0d065a95e6b18f035d5b9060e68f3909bc5270ce221f19bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf28203e880a0e0ef1af643a668b6570a2a7e7ac92bfb6f7b7337f4e88fe4b1c87f1756a288bd885aafb0b061fcb2dff862f860800183030d4094095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca0c65220d22ee9533e69ca0cca4f2d90dbabd0db71e86883dda79a6135a896c6c2a0148c872a3758db30e6cff63d5f8c1155bdf13d9a39bf993b42d3f2cc7a0c568ac0",
+                "rlp" : "0xf9025ff901f7a0417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08f513fa246e67ac0c2884bbdac76260a16224e0dc4fff830bb1def9e261c9181a0695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655ba0e76b86ccbec5399176a16dc8e3cbc3a936db1b328e7a55a09c4328c54b7d2f18b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795e8203e880a0fc1952b55031f7b176f9c2d6b943cc7e70704afa6984f208264b26db7fe633c688dfb777290f3c9bc8f862f860800183030d4094095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca0c65220d22ee9533e69ca0cca4f2d90dbabd0db71e86883dda79a6135a896c6c2a0148c872a3758db30e6cff63d5f8c1155bdf13d9a39bf993b42d3f2cc7a0c568ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -554,16 +691,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa068ac7c65a3a31b7d8be621d99d2f227701585de873dbdaa2b5f8d74be15af1b2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa9ecaa730290e3fe965838adcc2b89b359d9d0a279aadcabaefc9e132dcdfdfb",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x35c98cf5cd9c389c6f8b431a7c51baf7499b981031f1eccac9d6400aee50ce4f",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa61157cf1600055",
@@ -574,14 +704,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f47bf2",
+                "balance" : "0x4563918244f4795e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1e0884",
+                "balance" : "0x1e0b18",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallA_notEnoughGasInCall_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallA_notEnoughGasInCall_d0g0v0.json
index 8484cc66c..91c49bed2 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallA_notEnoughGasInCall_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallA_notEnoughGasInCall_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "refund_CallA_notEnoughGasInCall_d0g0v0_EIP150" : {
+    "refund_CallA_notEnoughGasInCall_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_notEnoughGasInCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x7bf1",
-                    "hash" : "0x37071f2f6b680bb2f610a73f95e912bce54a361960f6fba8daa5d3a3a5ac08a5",
-                    "mixHash" : "0xdb0918acc3552187fff18de320b44a018f142408d4ecaf2da9f1a588aa99b281",
-                    "nonce" : "0x2922ea9b2b685bc8",
+                    "hash" : "0x027c79c9be4e27ff3b55949518b235de64a48d95db5f1c970383172336da12e5",
+                    "mixHash" : "0x37feac9cce9141a9fc3aa56c279db248d1be5a4143f24db02e9288126f514ee1",
+                    "nonce" : "0x227f6d6fd1f3e80c",
                     "number" : "0x01",
                     "parentHash" : "0x97db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9",
-                    "receiptTrie" : "0x1294c1bc15d6a73500ad9133312e2e4aa3162e12e556aa1bcf34254ef1f4ecff",
-                    "stateRoot" : "0x7d9f69e59d6fc5fa9c828c4152eb9bd3a6039fc59e5d685c36b804bff87afc70",
+                    "receiptTrie" : "0x0c63b21a9354c48ef9a6a9ca36b7d55048e1b26096f140ed8431b5e79cbce81c",
+                    "stateRoot" : "0x82389d6f2ac514b88233a5a4509b1cd6333845781dcd413536d37870170f8851",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a097db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d9f69e59d6fc5fa9c828c4152eb9bd3a6039fc59e5d685c36b804bff87afc70a0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a01294c1bc15d6a73500ad9133312e2e4aa3162e12e556aa1bcf34254ef1f4ecffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf18203e880a0db0918acc3552187fff18de320b44a018f142408d4ecaf2da9f1a588aa99b281882922ea9b2b685bc8f862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
+                "rlp" : "0xf9025ff901f7a097db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082389d6f2ac514b88233a5a4509b1cd6333845781dcd413536d37870170f8851a0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a00c63b21a9354c48ef9a6a9ca36b7d55048e1b26096f140ed8431b5e79cbce81cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf18203e880a037feac9cce9141a9fc3aa56c279db248d1be5a4143f24db02e9288126f514ee188227f6d6fd1f3e80cf862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c91324185999270a5e384418116d61a2addcd1dfb2d0ed87e9fa6c4ec565c421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x37071f2f6b680bb2f610a73f95e912bce54a361960f6fba8daa5d3a3a5ac08a5",
-        "network" : "EIP150",
+        "lastblockhash" : "0x027c79c9be4e27ff3b55949518b235de64a48d95db5f1c970383172336da12e5",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa61138df1600055",
@@ -122,10 +129,140 @@
             }
         }
     },
-    "refund_CallA_notEnoughGasInCall_d0g0v0_EIP158" : {
+    "refund_CallA_notEnoughGasInCall_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_notEnoughGasInCall_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x7bf1",
+                    "hash" : "0xb4633af731f8d33c08745e922db27e9640e4f61d4ed3218649f7af155e886194",
+                    "mixHash" : "0x476c1dceeb5ff76b2fba9119fcca469700807bc781fc23463409199ba9bb9586",
+                    "nonce" : "0xe3f07a7de8829846",
+                    "number" : "0x01",
+                    "parentHash" : "0x97db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9",
+                    "receiptTrie" : "0x0c63b21a9354c48ef9a6a9ca36b7d55048e1b26096f140ed8431b5e79cbce81c",
+                    "stateRoot" : "0x82389d6f2ac514b88233a5a4509b1cd6333845781dcd413536d37870170f8851",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a097db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082389d6f2ac514b88233a5a4509b1cd6333845781dcd413536d37870170f8851a0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a00c63b21a9354c48ef9a6a9ca36b7d55048e1b26096f140ed8431b5e79cbce81cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf18203e880a0476c1dceeb5ff76b2fba9119fcca469700807bc781fc23463409199ba9bb958688e3f07a7de8829846f862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x014c08",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x4d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4c",
+                        "s" : "0x39aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x97db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc91324185999270a5e384418116d61a2addcd1dfb2d0ed87e9fa6c4ec565c421",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c91324185999270a5e384418116d61a2addcd1dfb2d0ed87e9fa6c4ec565c421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb4633af731f8d33c08745e922db27e9640e4f61d4ed3218649f7af155e886194",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa61138df1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f47bf1",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x010aa5",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa61138df1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        }
+    },
+    "refund_CallA_notEnoughGasInCall_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_notEnoughGasInCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -137,9 +274,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x7bf1",
-                    "hash" : "0x33c300d59f2fddf82071da0e475fdfdf458ee7ad87eee9a5834322edaeea81ee",
-                    "mixHash" : "0x7a11c37fe69fe649acff9041e816cc33de6b4975b164214827ef367b6d119db8",
-                    "nonce" : "0xd8d93ddfb1dbc7fd",
+                    "hash" : "0xbf8b5a4e8dd3e20fa2faf40d26af9eea22d47943cdab330eaaf37e9c6c18fc1e",
+                    "mixHash" : "0xc269ebd2e2eb6092cb21ac0971aae9269d3ba9a60ed26a17374d266ac5ec1111",
+                    "nonce" : "0xcb23cefd54689b91",
                     "number" : "0x01",
                     "parentHash" : "0x97db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9",
                     "receiptTrie" : "0x1294c1bc15d6a73500ad9133312e2e4aa3162e12e556aa1bcf34254ef1f4ecff",
@@ -148,7 +285,7 @@
                     "transactionsTrie" : "0xac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a097db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d9f69e59d6fc5fa9c828c4152eb9bd3a6039fc59e5d685c36b804bff87afc70a0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a01294c1bc15d6a73500ad9133312e2e4aa3162e12e556aa1bcf34254ef1f4ecffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf18203e880a07a11c37fe69fe649acff9041e816cc33de6b4975b164214827ef367b6d119db888d8d93ddfb1dbc7fdf862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
+                "rlp" : "0xf9025ff901f7a097db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d9f69e59d6fc5fa9c828c4152eb9bd3a6039fc59e5d685c36b804bff87afc70a0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a01294c1bc15d6a73500ad9133312e2e4aa3162e12e556aa1bcf34254ef1f4ecffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf18203e880a0c269ebd2e2eb6092cb21ac0971aae9269d3ba9a60ed26a17374d266ac5ec111188cb23cefd54689b91f862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -185,8 +322,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c91324185999270a5e384418116d61a2addcd1dfb2d0ed87e9fa6c4ec565c421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x33c300d59f2fddf82071da0e475fdfdf458ee7ad87eee9a5834322edaeea81ee",
-        "network" : "EIP158",
+        "lastblockhash" : "0xbf8b5a4e8dd3e20fa2faf40d26af9eea22d47943cdab330eaaf37e9c6c18fc1e",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -245,10 +382,10 @@
             }
         }
     },
-    "refund_CallA_notEnoughGasInCall_d0g0v0_Frontier" : {
+    "refund_CallA_notEnoughGasInCall_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_notEnoughGasInCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -259,19 +396,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x795d",
-                    "hash" : "0xd9329afe94931d6a22fef8b0b7146ba1550b344d0b6c422f380dd75f4addd407",
-                    "mixHash" : "0x292df2be7a8dd7413ed51ca1358172241438267903ee016ae40b64376e4e026d",
-                    "nonce" : "0x49d029854a49d3ec",
+                    "gasUsed" : "0x7bf1",
+                    "hash" : "0x7456a0935976d5b550dd40dcac0094596054a762600d6350ec15a5ccb23376e7",
+                    "mixHash" : "0xb0bbafdf02de0d658a3cad6013a2b5723b3f8929f58b9becc0a5b2afce901325",
+                    "nonce" : "0x41b37f0efce64dca",
                     "number" : "0x01",
                     "parentHash" : "0x97db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9",
-                    "receiptTrie" : "0xc3520a889b7b850f83ae84518e2f774054e53647356ea0b1756dc13b0ffb4241",
-                    "stateRoot" : "0x956c6deeb2ec461f3d1dd7e009089b8ee0c4b11c4e864d5b2fe55433a9b73f9e",
+                    "receiptTrie" : "0x1294c1bc15d6a73500ad9133312e2e4aa3162e12e556aa1bcf34254ef1f4ecff",
+                    "stateRoot" : "0x7d9f69e59d6fc5fa9c828c4152eb9bd3a6039fc59e5d685c36b804bff87afc70",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a097db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0956c6deeb2ec461f3d1dd7e009089b8ee0c4b11c4e864d5b2fe55433a9b73f9ea0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a0c3520a889b7b850f83ae84518e2f774054e53647356ea0b1756dc13b0ffb4241b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a0292df2be7a8dd7413ed51ca1358172241438267903ee016ae40b64376e4e026d8849d029854a49d3ecf862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
+                "rlp" : "0xf9025ff901f7a097db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d9f69e59d6fc5fa9c828c4152eb9bd3a6039fc59e5d685c36b804bff87afc70a0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a01294c1bc15d6a73500ad9133312e2e4aa3162e12e556aa1bcf34254ef1f4ecffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf18203e880a0b0bbafdf02de0d658a3cad6013a2b5723b3f8929f58b9becc0a5b2afce9013258841b37f0efce64dcaf862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -308,8 +445,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c91324185999270a5e384418116d61a2addcd1dfb2d0ed87e9fa6c4ec565c421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd9329afe94931d6a22fef8b0b7146ba1550b344d0b6c422f380dd75f4addd407",
-        "network" : "Frontier",
+        "lastblockhash" : "0x7456a0935976d5b550dd40dcac0094596054a762600d6350ec15a5ccb23376e7",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -320,14 +457,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4795d",
+                "balance" : "0x4563918244f47bf1",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x010d39",
+                "balance" : "0x010aa5",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -368,10 +505,10 @@
             }
         }
     },
-    "refund_CallA_notEnoughGasInCall_d0g0v0_Homestead" : {
+    "refund_CallA_notEnoughGasInCall_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_notEnoughGasInCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -383,9 +520,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x795d",
-                    "hash" : "0xc93a1f2e5b64369f59459664d9249981fb0d5c53f3e3999fbd50c54ec37f11e5",
-                    "mixHash" : "0xc16b3cc567ce4c1809e7a446a890c37a9a06c292c66222a49d72d59e5ef9e7a2",
-                    "nonce" : "0xac492674c764c671",
+                    "hash" : "0x09f313dcb391976282c7e9f28ccae27551940c011d08a2a1186de8e76aac61cd",
+                    "mixHash" : "0xcc3c1e0729ef12027bdd09d30f54d8e4579dee0fccbb14cd9857ff70a8159583",
+                    "nonce" : "0x9f507f6890c5cbae",
                     "number" : "0x01",
                     "parentHash" : "0x97db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9",
                     "receiptTrie" : "0xc3520a889b7b850f83ae84518e2f774054e53647356ea0b1756dc13b0ffb4241",
@@ -394,7 +531,7 @@
                     "transactionsTrie" : "0xac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a097db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0956c6deeb2ec461f3d1dd7e009089b8ee0c4b11c4e864d5b2fe55433a9b73f9ea0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a0c3520a889b7b850f83ae84518e2f774054e53647356ea0b1756dc13b0ffb4241b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a0c16b3cc567ce4c1809e7a446a890c37a9a06c292c66222a49d72d59e5ef9e7a288ac492674c764c671f862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
+                "rlp" : "0xf9025ff901f7a097db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0956c6deeb2ec461f3d1dd7e009089b8ee0c4b11c4e864d5b2fe55433a9b73f9ea0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a0c3520a889b7b850f83ae84518e2f774054e53647356ea0b1756dc13b0ffb4241b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a0cc3c1e0729ef12027bdd09d30f54d8e4579dee0fccbb14cd9857ff70a8159583889f507f6890c5cbaef862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -431,8 +568,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c91324185999270a5e384418116d61a2addcd1dfb2d0ed87e9fa6c4ec565c421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc93a1f2e5b64369f59459664d9249981fb0d5c53f3e3999fbd50c54ec37f11e5",
-        "network" : "Homestead",
+        "lastblockhash" : "0x09f313dcb391976282c7e9f28ccae27551940c011d08a2a1186de8e76aac61cd",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -491,10 +628,10 @@
             }
         }
     },
-    "refund_CallA_notEnoughGasInCall_d0g0v0_Metropolis" : {
+    "refund_CallA_notEnoughGasInCall_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/stRefundTest/refund_CallA_notEnoughGasInCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -505,19 +642,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x7bf1",
-                    "hash" : "0x3b4ef9c076fe127f83b38248d68b173d8827374d61151bc172edfe0b3ae4d0d7",
-                    "mixHash" : "0x63be11f0f1c8345473449c034b340324824c9d9d1b7f76bbc31033ed17a96699",
-                    "nonce" : "0x9844e11a203552c1",
+                    "gasUsed" : "0x795d",
+                    "hash" : "0xc6981389cb9436a49958a105a4aa38fe311e4aee99a4ec769289916846be18ad",
+                    "mixHash" : "0x233ce97750e799f0505b0f3a97c3350aaa766006558e6ca485303653d6ca2764",
+                    "nonce" : "0x9df864e963e5f138",
                     "number" : "0x01",
                     "parentHash" : "0x97db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9",
-                    "receiptTrie" : "0x0c63b21a9354c48ef9a6a9ca36b7d55048e1b26096f140ed8431b5e79cbce81c",
-                    "stateRoot" : "0x82389d6f2ac514b88233a5a4509b1cd6333845781dcd413536d37870170f8851",
+                    "receiptTrie" : "0xc3520a889b7b850f83ae84518e2f774054e53647356ea0b1756dc13b0ffb4241",
+                    "stateRoot" : "0x956c6deeb2ec461f3d1dd7e009089b8ee0c4b11c4e864d5b2fe55433a9b73f9e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a097db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082389d6f2ac514b88233a5a4509b1cd6333845781dcd413536d37870170f8851a0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a00c63b21a9354c48ef9a6a9ca36b7d55048e1b26096f140ed8431b5e79cbce81cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf18203e880a063be11f0f1c8345473449c034b340324824c9d9d1b7f76bbc31033ed17a96699889844e11a203552c1f862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
+                "rlp" : "0xf9025ff901f7a097db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0956c6deeb2ec461f3d1dd7e009089b8ee0c4b11c4e864d5b2fe55433a9b73f9ea0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a0c3520a889b7b850f83ae84518e2f774054e53647356ea0b1756dc13b0ffb4241b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a0233ce97750e799f0505b0f3a97c3350aaa766006558e6ca485303653d6ca2764889df864e963e5f138f862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -554,16 +691,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c91324185999270a5e384418116d61a2addcd1dfb2d0ed87e9fa6c4ec565c421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3b4ef9c076fe127f83b38248d68b173d8827374d61151bc172edfe0b3ae4d0d7",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xc6981389cb9436a49958a105a4aa38fe311e4aee99a4ec769289916846be18ad",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa61138df1600055",
@@ -573,14 +703,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f47bf1",
+                "balance" : "0x4563918244f4795d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x010aa5",
+                "balance" : "0x010d39",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage_d0g0v0.json
index cc9ab3594..a34501a63 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "refund_CallToSuicideNoStorage_d0g0v0_EIP150" : {
+    "refund_CallToSuicideNoStorage_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideNoStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x6b5b",
-                    "hash" : "0xb867cfdffe1207482c58ccc75a27184bc2b5a487d809bc9a19a912b34dc8b6b3",
-                    "mixHash" : "0xe29b72253f73924b59e9f895bdc627421d4eaaab9076a1904ef9e84e80c48862",
-                    "nonce" : "0xd744dfbb6f38970c",
+                    "hash" : "0xaf69574237ead3d0939ef7d40862b5b350a7d9e189b79c7951dff056a906faf1",
+                    "mixHash" : "0x7eb8c6b0d8d1fb7c2c5348b151d7d0f1c6000c82f48122a48bdb62cc5a8c72aa",
+                    "nonce" : "0xc18b762969bd40f9",
                     "number" : "0x01",
                     "parentHash" : "0xa26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6",
-                    "receiptTrie" : "0x7bc5b8b776d3e52217a40c51661f05054de6b86a5293bd7154cfabf695f49edb",
-                    "stateRoot" : "0x67413ad4a30c5d6752f1c4b97781cc43dc7abc4cbb5268feb1d0b9a9cfcdcf03",
+                    "receiptTrie" : "0x0c896fedc3d6ff2d36ec21231da77c2591a3a7def71219eed8af4d55e8d51eed",
+                    "stateRoot" : "0xf5b84843abfc27eaa9ba7fb1dbc793d14b7090d8fe48650ec279c1dd84abf81f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa067413ad4a30c5d6752f1c4b97781cc43dc7abc4cbb5268feb1d0b9a9cfcdcf03a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba07bc5b8b776d3e52217a40c51661f05054de6b86a5293bd7154cfabf695f49edbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a0e29b72253f73924b59e9f895bdc627421d4eaaab9076a1904ef9e84e80c4886288d744dfbb6f38970cf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5b84843abfc27eaa9ba7fb1dbc793d14b7090d8fe48650ec279c1dd84abf81fa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba00c896fedc3d6ff2d36ec21231da77c2591a3a7def71219eed8af4d55e8d51eedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a07eb8c6b0d8d1fb7c2c5348b151d7d0f1c6000c82f48122a48bdb62cc5a8c72aa88c18b762969bd40f9f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097f06e9b6eb04ffc2197b9e2f902aea3accd588b825d7f1a9a305af440bf0beaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb867cfdffe1207482c58ccc75a27184bc2b5a487d809bc9a19a912b34dc8b6b3",
-        "network" : "EIP150",
+        "lastblockhash" : "0xaf69574237ead3d0939ef7d40862b5b350a7d9e189b79c7951dff056a906faf1",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600055",
@@ -120,10 +127,138 @@
             }
         }
     },
-    "refund_CallToSuicideNoStorage_d0g0v0_EIP158" : {
+    "refund_CallToSuicideNoStorage_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideNoStorage_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x6b5b",
+                    "hash" : "0x8375e9e442f8ae37639933ec7fd0f413faa2b4f6e02bfb178b4e28140067c0cd",
+                    "mixHash" : "0x82ec43466b5c2728c9e36b73848a754f8258b0baa9accc48a433fc8713cd3feb",
+                    "nonce" : "0xbb7276ba1e5b7c2d",
+                    "number" : "0x01",
+                    "parentHash" : "0xa26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6",
+                    "receiptTrie" : "0x0c896fedc3d6ff2d36ec21231da77c2591a3a7def71219eed8af4d55e8d51eed",
+                    "stateRoot" : "0xf5b84843abfc27eaa9ba7fb1dbc793d14b7090d8fe48650ec279c1dd84abf81f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5b84843abfc27eaa9ba7fb1dbc793d14b7090d8fe48650ec279c1dd84abf81fa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba00c896fedc3d6ff2d36ec21231da77c2591a3a7def71219eed8af4d55e8d51eedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a082ec43466b5c2728c9e36b73848a754f8258b0baa9accc48a433fc8713cd3feb88bb7276ba1e5b7c2df882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
+                        "gasLimit" : "0x989680",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7",
+                        "s" : "0x661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xa26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x97f06e9b6eb04ffc2197b9e2f902aea3accd588b825d7f1a9a305af440bf0bea",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097f06e9b6eb04ffc2197b9e2f902aea3accd588b825d7f1a9a305af440bf0beaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8375e9e442f8ae37639933ec7fd0f413faa2b4f6e02bfb178b4e28140067c0cd",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f46b5b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f5759b",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f5e100",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "refund_CallToSuicideNoStorage_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideNoStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -135,9 +270,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x6b5b",
-                    "hash" : "0xaa5d588a8cd9d465c0ce6b8e80a3a555f573732c35e5cb2b97d2b0b336129248",
-                    "mixHash" : "0x67f03ca713e45ba1d325c9dbc60706f4756fb0b1c5364bad4fb2fde90468fa56",
-                    "nonce" : "0x9d9830a412275d2d",
+                    "hash" : "0xe5e498131a470bcfccd8a33aaee62d8ddadecf91d76514ef1cfc1f53089c3c07",
+                    "mixHash" : "0x1ceb3b3b0a0e975c8ca056601a8d80a4391a5b214524b75137545e26d15441ec",
+                    "nonce" : "0x5e9e8a620caeda61",
                     "number" : "0x01",
                     "parentHash" : "0xa26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6",
                     "receiptTrie" : "0x7bc5b8b776d3e52217a40c51661f05054de6b86a5293bd7154cfabf695f49edb",
@@ -146,7 +281,7 @@
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa067413ad4a30c5d6752f1c4b97781cc43dc7abc4cbb5268feb1d0b9a9cfcdcf03a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba07bc5b8b776d3e52217a40c51661f05054de6b86a5293bd7154cfabf695f49edbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a067f03ca713e45ba1d325c9dbc60706f4756fb0b1c5364bad4fb2fde90468fa56889d9830a412275d2df882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa067413ad4a30c5d6752f1c4b97781cc43dc7abc4cbb5268feb1d0b9a9cfcdcf03a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba07bc5b8b776d3e52217a40c51661f05054de6b86a5293bd7154cfabf695f49edbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a01ceb3b3b0a0e975c8ca056601a8d80a4391a5b214524b75137545e26d15441ec885e9e8a620caeda61f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -183,8 +318,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097f06e9b6eb04ffc2197b9e2f902aea3accd588b825d7f1a9a305af440bf0beaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaa5d588a8cd9d465c0ce6b8e80a3a555f573732c35e5cb2b97d2b0b336129248",
-        "network" : "EIP158",
+        "lastblockhash" : "0xe5e498131a470bcfccd8a33aaee62d8ddadecf91d76514ef1cfc1f53089c3c07",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -241,10 +376,10 @@
             }
         }
     },
-    "refund_CallToSuicideNoStorage_d0g0v0_Frontier" : {
+    "refund_CallToSuicideNoStorage_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideNoStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -255,19 +390,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x50b7",
-                    "hash" : "0x8e944e2f74c5221175d87865f273ab8300cbc48be9a673e884867438387a8735",
-                    "mixHash" : "0x7833c0d50fd9db3b2d813a6ce4bcc289a191f95cd742c7f5ae5e4dd5db2135c7",
-                    "nonce" : "0x84ea205495f22711",
+                    "gasUsed" : "0x6b5b",
+                    "hash" : "0xa50715c3f515e7fbbfb89792f5da8a39c7729c023fe664b7ce31f076af54583a",
+                    "mixHash" : "0x6c40e532827b79e658f43f1cdb04f56d74419832d7710b0e283015934d33d096",
+                    "nonce" : "0xcfd0efb39a4eb801",
                     "number" : "0x01",
                     "parentHash" : "0xa26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6",
-                    "receiptTrie" : "0xd74cbd00f66c19de7f9cc6f6529dc48c31c9a4dc1f25c7c780e888218db1145e",
-                    "stateRoot" : "0x6e1b2251f193b62f4a4857ff37d38855897c7af48a88e037ae6b522049bc2a6a",
+                    "receiptTrie" : "0x7bc5b8b776d3e52217a40c51661f05054de6b86a5293bd7154cfabf695f49edb",
+                    "stateRoot" : "0x67413ad4a30c5d6752f1c4b97781cc43dc7abc4cbb5268feb1d0b9a9cfcdcf03",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e1b2251f193b62f4a4857ff37d38855897c7af48a88e037ae6b522049bc2a6aa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0d74cbd00f66c19de7f9cc6f6529dc48c31c9a4dc1f25c7c780e888218db1145eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250b78203e880a07833c0d50fd9db3b2d813a6ce4bcc289a191f95cd742c7f5ae5e4dd5db2135c78884ea205495f22711f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa067413ad4a30c5d6752f1c4b97781cc43dc7abc4cbb5268feb1d0b9a9cfcdcf03a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba07bc5b8b776d3e52217a40c51661f05054de6b86a5293bd7154cfabf695f49edbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a06c40e532827b79e658f43f1cdb04f56d74419832d7710b0e283015934d33d09688cfd0efb39a4eb801f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -304,31 +439,37 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097f06e9b6eb04ffc2197b9e2f902aea3accd588b825d7f1a9a305af440bf0beaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8e944e2f74c5221175d87865f273ab8300cbc48be9a673e884867438387a8735",
-        "network" : "Frontier",
+        "lastblockhash" : "0xa50715c3f515e7fbbfb89792f5da8a39c7729c023fe664b7ce31f076af54583a",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x1bc16d674ec8000a",
+                "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600055",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x01",
                     "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f450b7",
+                "balance" : "0x4563918244f46b5b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x05f5903f",
+                "balance" : "0x05f5759b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
             }
         },
         "pre" : {
@@ -356,10 +497,10 @@
             }
         }
     },
-    "refund_CallToSuicideNoStorage_d0g0v0_Homestead" : {
+    "refund_CallToSuicideNoStorage_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideNoStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -371,9 +512,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x50b7",
-                    "hash" : "0x50a3821d8cecd998a65ca961d2de579a4741d0c6bad6aac8475b77dddab6eb54",
-                    "mixHash" : "0x2439584a3565ccf828cf7d8df44458fd6a6537f7822be546330db14757a2abcb",
-                    "nonce" : "0x64b0013fa5779318",
+                    "hash" : "0xb9f837522c126256c5f7b98c003037a7b4b2ca974c172983a4145606e5c0f2d3",
+                    "mixHash" : "0xeee00565a33902fb9717c10ef128051a0917e178e3ae0b1dd771c75165f00686",
+                    "nonce" : "0x9981ce44fc80f82b",
                     "number" : "0x01",
                     "parentHash" : "0xa26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6",
                     "receiptTrie" : "0xd74cbd00f66c19de7f9cc6f6529dc48c31c9a4dc1f25c7c780e888218db1145e",
@@ -382,7 +523,7 @@
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e1b2251f193b62f4a4857ff37d38855897c7af48a88e037ae6b522049bc2a6aa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0d74cbd00f66c19de7f9cc6f6529dc48c31c9a4dc1f25c7c780e888218db1145eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250b78203e880a02439584a3565ccf828cf7d8df44458fd6a6537f7822be546330db14757a2abcb8864b0013fa5779318f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e1b2251f193b62f4a4857ff37d38855897c7af48a88e037ae6b522049bc2a6aa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0d74cbd00f66c19de7f9cc6f6529dc48c31c9a4dc1f25c7c780e888218db1145eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250b78203e880a0eee00565a33902fb9717c10ef128051a0917e178e3ae0b1dd771c75165f00686889981ce44fc80f82bf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -419,8 +560,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097f06e9b6eb04ffc2197b9e2f902aea3accd588b825d7f1a9a305af440bf0beaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x50a3821d8cecd998a65ca961d2de579a4741d0c6bad6aac8475b77dddab6eb54",
-        "network" : "Homestead",
+        "lastblockhash" : "0xb9f837522c126256c5f7b98c003037a7b4b2ca974c172983a4145606e5c0f2d3",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec8000a",
@@ -471,10 +612,10 @@
             }
         }
     },
-    "refund_CallToSuicideNoStorage_d0g0v0_Metropolis" : {
+    "refund_CallToSuicideNoStorage_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/stRefundTest/refund_CallToSuicideNoStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -485,19 +626,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x6b5b",
-                    "hash" : "0x3b8ddc0e74c4a04ac1dcc76bcc99286ea83673a4642a6b09a2581176897a45f6",
-                    "mixHash" : "0x8bf06bfdcfa352907583b904b83019560423bf7e833b1e88fcab4dd479a8c687",
-                    "nonce" : "0xd5bbf6e984d3c4db",
+                    "gasUsed" : "0x50b7",
+                    "hash" : "0x030da33f0e16f74a504fd9e02c8ee71aea1f2e787eb1b6679e69ad7afe042c2e",
+                    "mixHash" : "0x26458aa093f3a9e6e2e08a1aca5ce5cbda125f4ec5fbde2de9029f793f9582cc",
+                    "nonce" : "0x07789d068a02348a",
                     "number" : "0x01",
                     "parentHash" : "0xa26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6",
-                    "receiptTrie" : "0x0c896fedc3d6ff2d36ec21231da77c2591a3a7def71219eed8af4d55e8d51eed",
-                    "stateRoot" : "0xf5b84843abfc27eaa9ba7fb1dbc793d14b7090d8fe48650ec279c1dd84abf81f",
+                    "receiptTrie" : "0xd74cbd00f66c19de7f9cc6f6529dc48c31c9a4dc1f25c7c780e888218db1145e",
+                    "stateRoot" : "0x6e1b2251f193b62f4a4857ff37d38855897c7af48a88e037ae6b522049bc2a6a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5b84843abfc27eaa9ba7fb1dbc793d14b7090d8fe48650ec279c1dd84abf81fa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba00c896fedc3d6ff2d36ec21231da77c2591a3a7def71219eed8af4d55e8d51eedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a08bf06bfdcfa352907583b904b83019560423bf7e833b1e88fcab4dd479a8c68788d5bbf6e984d3c4dbf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e1b2251f193b62f4a4857ff37d38855897c7af48a88e037ae6b522049bc2a6aa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0d74cbd00f66c19de7f9cc6f6529dc48c31c9a4dc1f25c7c780e888218db1145eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250b78203e880a026458aa093f3a9e6e2e08a1aca5ce5cbda125f4ec5fbde2de9029f793f9582cc8807789d068a02348af882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -534,44 +675,31 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097f06e9b6eb04ffc2197b9e2f902aea3accd588b825d7f1a9a305af440bf0beaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3b8ddc0e74c4a04ac1dcc76bcc99286ea83673a4642a6b09a2581176897a45f6",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x030da33f0e16f74a504fd9e02c8ee71aea1f2e787eb1b6679e69ad7afe042c2e",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a764000a",
+                "balance" : "0x1bc16d674ec8000a",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01",
                     "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f46b5b",
+                "balance" : "0x4563918244f450b7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x05f5759b",
+                "balance" : "0x05f5903f",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
             }
         },
         "pre" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage_d1g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage_d1g0v0.json
index 19ff08a80..513ed0868 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage_d1g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage_d1g0v0.json
@@ -1,8 +1,8 @@
 {
-    "refund_CallToSuicideNoStorage_d1g0v0_EIP150" : {
+    "refund_CallToSuicideNoStorage_d1g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideNoStorage_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5ba5",
-                    "hash" : "0xe48e0bf9ed8b21ac9c90b3300db46cb9e59889954f9d19cfd219561dab12f643",
-                    "mixHash" : "0xdf7a953e55e07bda261cbbe7a175c248358584a021a335c545e8f378881c4e36",
-                    "nonce" : "0xee38aa5578760b91",
+                    "hash" : "0x0741e4aeba4406457c5434367f0241ce2de2faf2d5ba27a427cbb59c4d760913",
+                    "mixHash" : "0x035be43f9c274af40c0fc223236224e8770ed46abe542ea7ee568cfd1eefc80f",
+                    "nonce" : "0x5baa8addfc304af7",
                     "number" : "0x01",
                     "parentHash" : "0xa26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6",
-                    "receiptTrie" : "0x2baee5e20a8ba9840322a73e69073540679f06fd8be716b0a47c28d8805ccde5",
-                    "stateRoot" : "0x33502c4c63922fca6b527f387ed8442a005b326575fcad3cc5a61ea9f3dfdef2",
+                    "receiptTrie" : "0x72266a13e75386db59178ac5409794ca14df029795264ddc46ffbe93be70ea6f",
+                    "stateRoot" : "0x55751195e47002db8dda08b2db5399c1b0b949b75930a90ac6112785159a0d78",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa033502c4c63922fca6b527f387ed8442a005b326575fcad3cc5a61ea9f3dfdef2a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca02baee5e20a8ba9840322a73e69073540679f06fd8be716b0a47c28d8805ccde5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a0df7a953e55e07bda261cbbe7a175c248358584a021a335c545e8f378881c4e3688ee38aa5578760b91f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055751195e47002db8dda08b2db5399c1b0b949b75930a90ac6112785159a0d78a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca072266a13e75386db59178ac5409794ca14df029795264ddc46ffbe93be70ea6fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a0035be43f9c274af40c0fc223236224e8770ed46abe542ea7ee568cfd1eefc80f885baa8addfc304af7f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097f06e9b6eb04ffc2197b9e2f902aea3accd588b825d7f1a9a305af440bf0beaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe48e0bf9ed8b21ac9c90b3300db46cb9e59889954f9d19cfd219561dab12f643",
-        "network" : "EIP150",
+        "lastblockhash" : "0x0741e4aeba4406457c5434367f0241ce2de2faf2d5ba27a427cbb59c4d760913",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec8000a",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600055",
@@ -114,10 +121,132 @@
             }
         }
     },
-    "refund_CallToSuicideNoStorage_d1g0v0_EIP158" : {
+    "refund_CallToSuicideNoStorage_d1g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideNoStorage_d1g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x5ba5",
+                    "hash" : "0xbd2914961667f5ec122ddbce8583b7e43b3b991b07645d242d1ba2ecec68bbff",
+                    "mixHash" : "0xfb3c73219a15b729901579ebab1c49006312f3c0d377c1fd207a5c0c7bf9bd38",
+                    "nonce" : "0xd468b2e0bc7eb4f7",
+                    "number" : "0x01",
+                    "parentHash" : "0xa26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6",
+                    "receiptTrie" : "0x72266a13e75386db59178ac5409794ca14df029795264ddc46ffbe93be70ea6f",
+                    "stateRoot" : "0x55751195e47002db8dda08b2db5399c1b0b949b75930a90ac6112785159a0d78",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055751195e47002db8dda08b2db5399c1b0b949b75930a90ac6112785159a0d78a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca072266a13e75386db59178ac5409794ca14df029795264ddc46ffbe93be70ea6fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a0fb3c73219a15b729901579ebab1c49006312f3c0d377c1fd207a5c0c7bf9bd3888d468b2e0bc7eb4f7f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
+                        "gasLimit" : "0x989680",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628",
+                        "s" : "0x7e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bcc",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xa26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x97f06e9b6eb04ffc2197b9e2f902aea3accd588b825d7f1a9a305af440bf0bea",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097f06e9b6eb04ffc2197b9e2f902aea3accd588b825d7f1a9a305af440bf0beaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xbd2914961667f5ec122ddbce8583b7e43b3b991b07645d242d1ba2ecec68bbff",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x1bc16d674ec8000a",
+                "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f45ba5",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f58551",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f5e100",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "refund_CallToSuicideNoStorage_d1g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideNoStorage_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -129,9 +258,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5ba5",
-                    "hash" : "0x255731caa63014ecbe0a53ba29527bbb957d5024f41626f67c7c08ff2d52607c",
-                    "mixHash" : "0xe2b85b3955057f62ae503eb840887c032e233b37c1a10cfed7418589917daaa4",
-                    "nonce" : "0xb4c5706d0ea47ce3",
+                    "hash" : "0x5dedb8f1da8809c9cb1d35498abc2002c7c7793e5b983bcf5db7dc0a4588c9ea",
+                    "mixHash" : "0x118d2d66d608352c9c48d44abadf07979b4c317ace88cf34588027cad8d8065e",
+                    "nonce" : "0x1afa8f0f287a7e11",
                     "number" : "0x01",
                     "parentHash" : "0xa26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6",
                     "receiptTrie" : "0x2baee5e20a8ba9840322a73e69073540679f06fd8be716b0a47c28d8805ccde5",
@@ -140,7 +269,7 @@
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa033502c4c63922fca6b527f387ed8442a005b326575fcad3cc5a61ea9f3dfdef2a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca02baee5e20a8ba9840322a73e69073540679f06fd8be716b0a47c28d8805ccde5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a0e2b85b3955057f62ae503eb840887c032e233b37c1a10cfed7418589917daaa488b4c5706d0ea47ce3f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa033502c4c63922fca6b527f387ed8442a005b326575fcad3cc5a61ea9f3dfdef2a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca02baee5e20a8ba9840322a73e69073540679f06fd8be716b0a47c28d8805ccde5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a0118d2d66d608352c9c48d44abadf07979b4c317ace88cf34588027cad8d8065e881afa8f0f287a7e11f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -177,8 +306,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097f06e9b6eb04ffc2197b9e2f902aea3accd588b825d7f1a9a305af440bf0beaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x255731caa63014ecbe0a53ba29527bbb957d5024f41626f67c7c08ff2d52607c",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5dedb8f1da8809c9cb1d35498abc2002c7c7793e5b983bcf5db7dc0a4588c9ea",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec8000a",
@@ -229,10 +358,10 @@
             }
         }
     },
-    "refund_CallToSuicideNoStorage_d1g0v0_Frontier" : {
+    "refund_CallToSuicideNoStorage_d1g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideNoStorage_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -243,19 +372,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x5097",
-                    "hash" : "0x085457f3887c48459f3d9f90ed0c1e7526a8a95594fe48689d9caa6905a9bee9",
-                    "mixHash" : "0x24547e55055147887b092ef0058054959ac8bfbe0661aeccdf141bc6676ee23e",
-                    "nonce" : "0x6e58ba3540661478",
+                    "gasUsed" : "0x5ba5",
+                    "hash" : "0x6489e418c8a2e83e4de7330ad93edf083328753ac935c082e6036709d30b6e77",
+                    "mixHash" : "0x84c928fd309136954121a888091d10f789e71660ab61bc7c12d12896c7733592",
+                    "nonce" : "0x454d67584d2bdd1f",
                     "number" : "0x01",
                     "parentHash" : "0xa26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6",
-                    "receiptTrie" : "0x4aed715e223b0a97ae25f596341609129ba903602aed59256a2d23b93bdf0a3c",
-                    "stateRoot" : "0x9bcd576f06199fb445095610ff21cbf362b6f58dcd419c3b560c377803fedcc6",
+                    "receiptTrie" : "0x2baee5e20a8ba9840322a73e69073540679f06fd8be716b0a47c28d8805ccde5",
+                    "stateRoot" : "0x33502c4c63922fca6b527f387ed8442a005b326575fcad3cc5a61ea9f3dfdef2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bcd576f06199fb445095610ff21cbf362b6f58dcd419c3b560c377803fedcc6a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca04aed715e223b0a97ae25f596341609129ba903602aed59256a2d23b93bdf0a3cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250978203e880a024547e55055147887b092ef0058054959ac8bfbe0661aeccdf141bc6676ee23e886e58ba3540661478f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa033502c4c63922fca6b527f387ed8442a005b326575fcad3cc5a61ea9f3dfdef2a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca02baee5e20a8ba9840322a73e69073540679f06fd8be716b0a47c28d8805ccde5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a084c928fd309136954121a888091d10f789e71660ab61bc7c12d12896c773359288454d67584d2bdd1ff882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -292,8 +421,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097f06e9b6eb04ffc2197b9e2f902aea3accd588b825d7f1a9a305af440bf0beaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x085457f3887c48459f3d9f90ed0c1e7526a8a95594fe48689d9caa6905a9bee9",
-        "network" : "Frontier",
+        "lastblockhash" : "0x6489e418c8a2e83e4de7330ad93edf083328753ac935c082e6036709d30b6e77",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec8000a",
@@ -305,14 +434,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f45097",
+                "balance" : "0x4563918244f45ba5",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x05f5905f",
+                "balance" : "0x05f58551",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -344,10 +473,10 @@
             }
         }
     },
-    "refund_CallToSuicideNoStorage_d1g0v0_Homestead" : {
+    "refund_CallToSuicideNoStorage_d1g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideNoStorage_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -359,9 +488,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5097",
-                    "hash" : "0x60c6f8fbb6570725f761969e5b255ce1a7d691c402096fa554d5f78b2d8b3c8c",
-                    "mixHash" : "0x986f778a14f34bfd8201018ec26d9e7a57c64511ccfed81534f114256133ac22",
-                    "nonce" : "0x56d52d02e349c4e8",
+                    "hash" : "0xf9653ae6a23f73447e1f4e15d6207ae210092d61868a6c5901a4cc3634b1e1c0",
+                    "mixHash" : "0x533d1e7b518261eac10dc3c0e1da1bd69cec350b23033224ebc8db15981611c6",
+                    "nonce" : "0xeb18a28d9e9313ca",
                     "number" : "0x01",
                     "parentHash" : "0xa26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6",
                     "receiptTrie" : "0x4aed715e223b0a97ae25f596341609129ba903602aed59256a2d23b93bdf0a3c",
@@ -370,7 +499,7 @@
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bcd576f06199fb445095610ff21cbf362b6f58dcd419c3b560c377803fedcc6a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca04aed715e223b0a97ae25f596341609129ba903602aed59256a2d23b93bdf0a3cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250978203e880a0986f778a14f34bfd8201018ec26d9e7a57c64511ccfed81534f114256133ac228856d52d02e349c4e8f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bcd576f06199fb445095610ff21cbf362b6f58dcd419c3b560c377803fedcc6a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca04aed715e223b0a97ae25f596341609129ba903602aed59256a2d23b93bdf0a3cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250978203e880a0533d1e7b518261eac10dc3c0e1da1bd69cec350b23033224ebc8db15981611c688eb18a28d9e9313caf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -407,8 +536,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097f06e9b6eb04ffc2197b9e2f902aea3accd588b825d7f1a9a305af440bf0beaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x60c6f8fbb6570725f761969e5b255ce1a7d691c402096fa554d5f78b2d8b3c8c",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf9653ae6a23f73447e1f4e15d6207ae210092d61868a6c5901a4cc3634b1e1c0",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec8000a",
@@ -459,10 +588,10 @@
             }
         }
     },
-    "refund_CallToSuicideNoStorage_d1g0v0_Metropolis" : {
+    "refund_CallToSuicideNoStorage_d1g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideNoStorage_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -473,19 +602,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x5ba5",
-                    "hash" : "0xb3d5b1b03f9aeee9c2e83f5f46843b39faf0f0b9a17a80008abe5e49d444321f",
-                    "mixHash" : "0x77d6e13eb5acde1ac63326908d3264c8e305250f531cdd065bc80f2943a6cd08",
-                    "nonce" : "0xbdd29719692850b3",
+                    "gasUsed" : "0x5097",
+                    "hash" : "0x3e2319e0fd4c63eea209a6f0f42edf249dd5b7f21083944a684a46aa110cba41",
+                    "mixHash" : "0x81ebdfbd2f3aed94066cb56ecaecaad9876d4cc0363652e21b29a9de4060cecc",
+                    "nonce" : "0xbd24e7dd4a8abc13",
                     "number" : "0x01",
                     "parentHash" : "0xa26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6",
-                    "receiptTrie" : "0x72266a13e75386db59178ac5409794ca14df029795264ddc46ffbe93be70ea6f",
-                    "stateRoot" : "0x55751195e47002db8dda08b2db5399c1b0b949b75930a90ac6112785159a0d78",
+                    "receiptTrie" : "0x4aed715e223b0a97ae25f596341609129ba903602aed59256a2d23b93bdf0a3c",
+                    "stateRoot" : "0x9bcd576f06199fb445095610ff21cbf362b6f58dcd419c3b560c377803fedcc6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055751195e47002db8dda08b2db5399c1b0b949b75930a90ac6112785159a0d78a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca072266a13e75386db59178ac5409794ca14df029795264ddc46ffbe93be70ea6fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a077d6e13eb5acde1ac63326908d3264c8e305250f531cdd065bc80f2943a6cd0888bdd29719692850b3f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bcd576f06199fb445095610ff21cbf362b6f58dcd419c3b560c377803fedcc6a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca04aed715e223b0a97ae25f596341609129ba903602aed59256a2d23b93bdf0a3cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250978203e880a081ebdfbd2f3aed94066cb56ecaecaad9876d4cc0363652e21b29a9de4060cecc88bd24e7dd4a8abc13f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -522,16 +651,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097f06e9b6eb04ffc2197b9e2f902aea3accd588b825d7f1a9a305af440bf0beaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb3d5b1b03f9aeee9c2e83f5f46843b39faf0f0b9a17a80008abe5e49d444321f",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x3e2319e0fd4c63eea209a6f0f42edf249dd5b7f21083944a684a46aa110cba41",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec8000a",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600055",
@@ -542,14 +664,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f45ba5",
+                "balance" : "0x4563918244f45097",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x05f58551",
+                "balance" : "0x05f5905f",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage_d0g0v0.json
index 72194371f..8aee31818 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "refund_CallToSuicideStorage_d0g0v0_EIP150" : {
+    "refund_CallToSuicideStorage_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x6b5b",
-                    "hash" : "0x996dd3aaba4ec93f47a06b52f5d064abdab2851a4f74e93cc9fc5fda7acda138",
-                    "mixHash" : "0x963a0689f982f91caaa38684117327496ad426605c11e918effcbae9e6c8dfc3",
-                    "nonce" : "0xecc6a92e57d5149f",
+                    "hash" : "0xead503647e20108be01ee4823a3a2873b2b4acb64b6b9edfbb7aa5224b10e312",
+                    "mixHash" : "0xf86e31dfa4686b14a439ee0fe28db0a9906268cc9187ab555305af80f6530285",
+                    "nonce" : "0x74c786a555bc89df",
                     "number" : "0x01",
                     "parentHash" : "0xc69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52b",
-                    "receiptTrie" : "0x1d0cb83f8acbc36299345dd45eac743a7a5dcd786a02e720c98abd7d046d3eca",
-                    "stateRoot" : "0xe890003dfb213f52aed52152775aeca0eed96be24d1fcf8cc411d4b10ea78314",
+                    "receiptTrie" : "0x0c896fedc3d6ff2d36ec21231da77c2591a3a7def71219eed8af4d55e8d51eed",
+                    "stateRoot" : "0x447cd735de27c5ede6d3f37a4947d8ec0bdd882e7254ee9eb1102aa20a1d1b90",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e890003dfb213f52aed52152775aeca0eed96be24d1fcf8cc411d4b10ea78314a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba01d0cb83f8acbc36299345dd45eac743a7a5dcd786a02e720c98abd7d046d3ecab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a0963a0689f982f91caaa38684117327496ad426605c11e918effcbae9e6c8dfc388ecc6a92e57d5149ff882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0447cd735de27c5ede6d3f37a4947d8ec0bdd882e7254ee9eb1102aa20a1d1b90a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba00c896fedc3d6ff2d36ec21231da77c2591a3a7def71219eed8af4d55e8d51eedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a0f86e31dfa4686b14a439ee0fe28db0a9906268cc9187ab555305af80f65302858874c786a555bc89dff882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0913733cbf9c11709c2db4c1998d1cb8c29de792cb947c5c170105fcf0fd3e7a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x996dd3aaba4ec93f47a06b52f5d064abdab2851a4f74e93cc9fc5fda7acda138",
-        "network" : "EIP150",
+        "lastblockhash" : "0xead503647e20108be01ee4823a3a2873b2b4acb64b6b9edfbb7aa5224b10e312",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600055",
@@ -122,10 +129,140 @@
             }
         }
     },
-    "refund_CallToSuicideStorage_d0g0v0_EIP158" : {
+    "refund_CallToSuicideStorage_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideStorage_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x6b5b",
+                    "hash" : "0xcc2e1242c192c61cc66d739d2b08567cf85e81d532bd26e83420c5615a344c48",
+                    "mixHash" : "0x72580962e927c7385081bd5be013219b864c4dc1b4579822d8faa49472500a4c",
+                    "nonce" : "0x429f38216f52fa32",
+                    "number" : "0x01",
+                    "parentHash" : "0xc69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52b",
+                    "receiptTrie" : "0x0c896fedc3d6ff2d36ec21231da77c2591a3a7def71219eed8af4d55e8d51eed",
+                    "stateRoot" : "0x447cd735de27c5ede6d3f37a4947d8ec0bdd882e7254ee9eb1102aa20a1d1b90",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0447cd735de27c5ede6d3f37a4947d8ec0bdd882e7254ee9eb1102aa20a1d1b90a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba00c896fedc3d6ff2d36ec21231da77c2591a3a7def71219eed8af4d55e8d51eedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a072580962e927c7385081bd5be013219b864c4dc1b4579822d8faa49472500a4c88429f38216f52fa32f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
+                        "gasLimit" : "0x989680",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7",
+                        "s" : "0x661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xc69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x913733cbf9c11709c2db4c1998d1cb8c29de792cb947c5c170105fcf0fd3e7a2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0913733cbf9c11709c2db4c1998d1cb8c29de792cb947c5c170105fcf0fd3e7a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcc2e1242c192c61cc66d739d2b08567cf85e81d532bd26e83420c5615a344c48",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f46b5b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f5759b",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f5e100",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        }
+    },
+    "refund_CallToSuicideStorage_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -137,9 +274,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x6b5b",
-                    "hash" : "0x9add092013e22c59f2476a61dcfdb8f0abe6b72380a4a20f58e57a718fb732d1",
-                    "mixHash" : "0x38f041891cc81b0a8e2f8d3173745df8e89a3f9431dcef5c888db395b5bae819",
-                    "nonce" : "0x82e52192bbba682e",
+                    "hash" : "0x3b868ce2fa16348cbac224e54b112acdbee1170187b6625a8e4aade737e80134",
+                    "mixHash" : "0x66fad4ba94bf7755ac920e594937696580f06150ac385f712b6ef5ac83592d24",
+                    "nonce" : "0x3b89b2c729f8f268",
                     "number" : "0x01",
                     "parentHash" : "0xc69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52b",
                     "receiptTrie" : "0x1d0cb83f8acbc36299345dd45eac743a7a5dcd786a02e720c98abd7d046d3eca",
@@ -148,7 +285,7 @@
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e890003dfb213f52aed52152775aeca0eed96be24d1fcf8cc411d4b10ea78314a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba01d0cb83f8acbc36299345dd45eac743a7a5dcd786a02e720c98abd7d046d3ecab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a038f041891cc81b0a8e2f8d3173745df8e89a3f9431dcef5c888db395b5bae8198882e52192bbba682ef882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e890003dfb213f52aed52152775aeca0eed96be24d1fcf8cc411d4b10ea78314a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba01d0cb83f8acbc36299345dd45eac743a7a5dcd786a02e720c98abd7d046d3ecab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a066fad4ba94bf7755ac920e594937696580f06150ac385f712b6ef5ac83592d24883b89b2c729f8f268f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -185,8 +322,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0913733cbf9c11709c2db4c1998d1cb8c29de792cb947c5c170105fcf0fd3e7a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9add092013e22c59f2476a61dcfdb8f0abe6b72380a4a20f58e57a718fb732d1",
-        "network" : "EIP158",
+        "lastblockhash" : "0x3b868ce2fa16348cbac224e54b112acdbee1170187b6625a8e4aade737e80134",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -245,10 +382,10 @@
             }
         }
     },
-    "refund_CallToSuicideStorage_d0g0v0_Frontier" : {
+    "refund_CallToSuicideStorage_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -259,19 +396,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x50b7",
-                    "hash" : "0xb44beb631e4f75c4a1603d3e8f0cd1134967b979394148036f096dbd754587f7",
-                    "mixHash" : "0x48a57afb4ef2daa7864e65ffa2d90ee32f4794e8ba9b7f034e5c567e67dc9d39",
-                    "nonce" : "0x6706b1d4f224c31d",
+                    "gasUsed" : "0x6b5b",
+                    "hash" : "0xd75c145a9e3ece37ccc6084e834ba5260acc67e4666d67f2170d307439c7cf23",
+                    "mixHash" : "0x75fee558fcfdbdc8f589b23c68e633f7f54e6ae28498b321acc4aa00503519fe",
+                    "nonce" : "0xde12e9d24d7ac0c1",
                     "number" : "0x01",
                     "parentHash" : "0xc69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52b",
-                    "receiptTrie" : "0xd74cbd00f66c19de7f9cc6f6529dc48c31c9a4dc1f25c7c780e888218db1145e",
-                    "stateRoot" : "0x6e1b2251f193b62f4a4857ff37d38855897c7af48a88e037ae6b522049bc2a6a",
+                    "receiptTrie" : "0x1d0cb83f8acbc36299345dd45eac743a7a5dcd786a02e720c98abd7d046d3eca",
+                    "stateRoot" : "0xe890003dfb213f52aed52152775aeca0eed96be24d1fcf8cc411d4b10ea78314",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e1b2251f193b62f4a4857ff37d38855897c7af48a88e037ae6b522049bc2a6aa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0d74cbd00f66c19de7f9cc6f6529dc48c31c9a4dc1f25c7c780e888218db1145eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250b78203e880a048a57afb4ef2daa7864e65ffa2d90ee32f4794e8ba9b7f034e5c567e67dc9d39886706b1d4f224c31df882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e890003dfb213f52aed52152775aeca0eed96be24d1fcf8cc411d4b10ea78314a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba01d0cb83f8acbc36299345dd45eac743a7a5dcd786a02e720c98abd7d046d3ecab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a075fee558fcfdbdc8f589b23c68e633f7f54e6ae28498b321acc4aa00503519fe88de12e9d24d7ac0c1f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -308,31 +445,38 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0913733cbf9c11709c2db4c1998d1cb8c29de792cb947c5c170105fcf0fd3e7a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb44beb631e4f75c4a1603d3e8f0cd1134967b979394148036f096dbd754587f7",
-        "network" : "Frontier",
+        "lastblockhash" : "0xd75c145a9e3ece37ccc6084e834ba5260acc67e4666d67f2170d307439c7cf23",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x1bc16d674ec8000a",
+                "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600055",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x01",
                     "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f450b7",
+                "balance" : "0x4563918244f46b5b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x05f5903f",
+                "balance" : "0x05f5759b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
             }
         },
         "pre" : {
@@ -361,10 +505,10 @@
             }
         }
     },
-    "refund_CallToSuicideStorage_d0g0v0_Homestead" : {
+    "refund_CallToSuicideStorage_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -376,9 +520,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x50b7",
-                    "hash" : "0x29c64148382485435b2a741cc5cd12131624a8e726d2188b612bf631f4f3621a",
-                    "mixHash" : "0xcc3a1ae69af6d7811a5863bf8c7fd183c57633b4419f030d081d1ca68438088b",
-                    "nonce" : "0xd6943418a5bc3140",
+                    "hash" : "0x89ec6b88f5e41123eab5097d546532e2156c58c6ae817f9717096c7e8380075b",
+                    "mixHash" : "0xdcb93415cec85ec992260505431b4dfc0bfba67c8175e6ddf16f4ea093db6f53",
+                    "nonce" : "0x8b076e55bfc8e2e1",
                     "number" : "0x01",
                     "parentHash" : "0xc69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52b",
                     "receiptTrie" : "0xd74cbd00f66c19de7f9cc6f6529dc48c31c9a4dc1f25c7c780e888218db1145e",
@@ -387,7 +531,7 @@
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e1b2251f193b62f4a4857ff37d38855897c7af48a88e037ae6b522049bc2a6aa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0d74cbd00f66c19de7f9cc6f6529dc48c31c9a4dc1f25c7c780e888218db1145eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250b78203e880a0cc3a1ae69af6d7811a5863bf8c7fd183c57633b4419f030d081d1ca68438088b88d6943418a5bc3140f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e1b2251f193b62f4a4857ff37d38855897c7af48a88e037ae6b522049bc2a6aa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0d74cbd00f66c19de7f9cc6f6529dc48c31c9a4dc1f25c7c780e888218db1145eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250b78203e880a0dcb93415cec85ec992260505431b4dfc0bfba67c8175e6ddf16f4ea093db6f53888b076e55bfc8e2e1f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -424,8 +568,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0913733cbf9c11709c2db4c1998d1cb8c29de792cb947c5c170105fcf0fd3e7a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x29c64148382485435b2a741cc5cd12131624a8e726d2188b612bf631f4f3621a",
-        "network" : "Homestead",
+        "lastblockhash" : "0x89ec6b88f5e41123eab5097d546532e2156c58c6ae817f9717096c7e8380075b",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec8000a",
@@ -477,10 +621,10 @@
             }
         }
     },
-    "refund_CallToSuicideStorage_d0g0v0_Metropolis" : {
+    "refund_CallToSuicideStorage_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/stRefundTest/refund_CallToSuicideStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -491,19 +635,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x6b5b",
-                    "hash" : "0xe478cd6a60f2fc9e9088c18fd50a33f49940889f92d69dc0e72ad3b826463b70",
-                    "mixHash" : "0x01513bee5fa2caa7ea506bafe202ffe5c6a3d2d27bc636ff34a1d7f194d1221b",
-                    "nonce" : "0x4f46ee7b431fdec7",
+                    "gasUsed" : "0x50b7",
+                    "hash" : "0xf95fbb9799b5913a2a7275d2305f2758b9ca0e9c5b54333ce471e7c5f5df9c69",
+                    "mixHash" : "0xe80ac2fa39dec6e6dba4ff35792a531e72bbe5166504205c006677ee819f5ffd",
+                    "nonce" : "0x68e7cd1ffd0341fd",
                     "number" : "0x01",
                     "parentHash" : "0xc69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52b",
-                    "receiptTrie" : "0x0c896fedc3d6ff2d36ec21231da77c2591a3a7def71219eed8af4d55e8d51eed",
-                    "stateRoot" : "0x447cd735de27c5ede6d3f37a4947d8ec0bdd882e7254ee9eb1102aa20a1d1b90",
+                    "receiptTrie" : "0xd74cbd00f66c19de7f9cc6f6529dc48c31c9a4dc1f25c7c780e888218db1145e",
+                    "stateRoot" : "0x6e1b2251f193b62f4a4857ff37d38855897c7af48a88e037ae6b522049bc2a6a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0447cd735de27c5ede6d3f37a4947d8ec0bdd882e7254ee9eb1102aa20a1d1b90a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba00c896fedc3d6ff2d36ec21231da77c2591a3a7def71219eed8af4d55e8d51eedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a001513bee5fa2caa7ea506bafe202ffe5c6a3d2d27bc636ff34a1d7f194d1221b884f46ee7b431fdec7f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e1b2251f193b62f4a4857ff37d38855897c7af48a88e037ae6b522049bc2a6aa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0d74cbd00f66c19de7f9cc6f6529dc48c31c9a4dc1f25c7c780e888218db1145eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250b78203e880a0e80ac2fa39dec6e6dba4ff35792a531e72bbe5166504205c006677ee819f5ffd8868e7cd1ffd0341fdf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -540,45 +684,31 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0913733cbf9c11709c2db4c1998d1cb8c29de792cb947c5c170105fcf0fd3e7a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe478cd6a60f2fc9e9088c18fd50a33f49940889f92d69dc0e72ad3b826463b70",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xf95fbb9799b5913a2a7275d2305f2758b9ca0e9c5b54333ce471e7c5f5df9c69",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a764000a",
+                "balance" : "0x1bc16d674ec8000a",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600055",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01",
                     "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f46b5b",
+                "balance" : "0x4563918244f450b7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x05f5759b",
+                "balance" : "0x05f5903f",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x01" : "0x01"
-                }
             }
         },
         "pre" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage_d1g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage_d1g0v0.json
index 92bc3a3fa..f3c2ede6a 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage_d1g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage_d1g0v0.json
@@ -1,8 +1,8 @@
 {
-    "refund_CallToSuicideStorage_d1g0v0_EIP150" : {
+    "refund_CallToSuicideStorage_d1g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideStorage_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5ba5",
-                    "hash" : "0xaa5e95ea40470b2c3e59c04ac48f2b3f8bec9e63d54969bf171346a1c35e25bc",
-                    "mixHash" : "0x1a4953f89d617a8536609bed311609ec43ed3b57dc76bf98966279343b2c43ea",
-                    "nonce" : "0x704362e7d9e8bb01",
+                    "hash" : "0x55e5a8b516981b3a75da39504ad38aa4601354305178dd96de34f3cd90c959d8",
+                    "mixHash" : "0x6764c7e040f9e12152b8d37a8325dcc29a6ecd77819ce81c9815167fcb206532",
+                    "nonce" : "0xf7d8316ca796b968",
                     "number" : "0x01",
                     "parentHash" : "0xc69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52b",
-                    "receiptTrie" : "0x2baee5e20a8ba9840322a73e69073540679f06fd8be716b0a47c28d8805ccde5",
-                    "stateRoot" : "0x33502c4c63922fca6b527f387ed8442a005b326575fcad3cc5a61ea9f3dfdef2",
+                    "receiptTrie" : "0x72266a13e75386db59178ac5409794ca14df029795264ddc46ffbe93be70ea6f",
+                    "stateRoot" : "0x55751195e47002db8dda08b2db5399c1b0b949b75930a90ac6112785159a0d78",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa033502c4c63922fca6b527f387ed8442a005b326575fcad3cc5a61ea9f3dfdef2a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca02baee5e20a8ba9840322a73e69073540679f06fd8be716b0a47c28d8805ccde5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a01a4953f89d617a8536609bed311609ec43ed3b57dc76bf98966279343b2c43ea88704362e7d9e8bb01f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055751195e47002db8dda08b2db5399c1b0b949b75930a90ac6112785159a0d78a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca072266a13e75386db59178ac5409794ca14df029795264ddc46ffbe93be70ea6fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a06764c7e040f9e12152b8d37a8325dcc29a6ecd77819ce81c9815167fcb20653288f7d8316ca796b968f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0913733cbf9c11709c2db4c1998d1cb8c29de792cb947c5c170105fcf0fd3e7a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaa5e95ea40470b2c3e59c04ac48f2b3f8bec9e63d54969bf171346a1c35e25bc",
-        "network" : "EIP150",
+        "lastblockhash" : "0x55e5a8b516981b3a75da39504ad38aa4601354305178dd96de34f3cd90c959d8",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec8000a",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600055",
@@ -115,10 +122,10 @@
             }
         }
     },
-    "refund_CallToSuicideStorage_d1g0v0_EIP158" : {
+    "refund_CallToSuicideStorage_d1g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideStorage_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -130,9 +137,132 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5ba5",
-                    "hash" : "0x4d2edbca7bd57f264074abdc48d26795e0489ecde17a53eed236af7e24d00926",
-                    "mixHash" : "0xfc2d0ccb59e92e80137152f7bff95ed1d354d33e946ca72c04f6ca75d212050b",
-                    "nonce" : "0x752bbcf9c6e908a0",
+                    "hash" : "0x3bd05032595e2740b25699737e03452a7f7c0102de45a3929ea2693e5fdb1c88",
+                    "mixHash" : "0xa4852100652aaa1538a3ba111985926c9796c3ab30a01a6aea514596570a158e",
+                    "nonce" : "0x4d7f24ccc3376021",
+                    "number" : "0x01",
+                    "parentHash" : "0xc69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52b",
+                    "receiptTrie" : "0x72266a13e75386db59178ac5409794ca14df029795264ddc46ffbe93be70ea6f",
+                    "stateRoot" : "0x55751195e47002db8dda08b2db5399c1b0b949b75930a90ac6112785159a0d78",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055751195e47002db8dda08b2db5399c1b0b949b75930a90ac6112785159a0d78a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca072266a13e75386db59178ac5409794ca14df029795264ddc46ffbe93be70ea6fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a0a4852100652aaa1538a3ba111985926c9796c3ab30a01a6aea514596570a158e884d7f24ccc3376021f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
+                        "gasLimit" : "0x989680",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628",
+                        "s" : "0x7e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bcc",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xc69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x913733cbf9c11709c2db4c1998d1cb8c29de792cb947c5c170105fcf0fd3e7a2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0913733cbf9c11709c2db4c1998d1cb8c29de792cb947c5c170105fcf0fd3e7a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3bd05032595e2740b25699737e03452a7f7c0102de45a3929ea2693e5fdb1c88",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x1bc16d674ec8000a",
+                "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f45ba5",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f58551",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f5e100",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        }
+    },
+    "refund_CallToSuicideStorage_d1g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideStorage_d1g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x5ba5",
+                    "hash" : "0xd13be9ec2690f4381bbc5277cb1cdf67572472306fb478d9add9be40db65262b",
+                    "mixHash" : "0x3041a8f788ba1a57ab3e65e9bd1bae7cd014c48355ee76dc18ff35b95bdf7cd2",
+                    "nonce" : "0x8397111dd49c0c42",
                     "number" : "0x01",
                     "parentHash" : "0xc69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52b",
                     "receiptTrie" : "0x2baee5e20a8ba9840322a73e69073540679f06fd8be716b0a47c28d8805ccde5",
@@ -141,7 +271,7 @@
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa033502c4c63922fca6b527f387ed8442a005b326575fcad3cc5a61ea9f3dfdef2a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca02baee5e20a8ba9840322a73e69073540679f06fd8be716b0a47c28d8805ccde5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a0fc2d0ccb59e92e80137152f7bff95ed1d354d33e946ca72c04f6ca75d212050b88752bbcf9c6e908a0f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa033502c4c63922fca6b527f387ed8442a005b326575fcad3cc5a61ea9f3dfdef2a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca02baee5e20a8ba9840322a73e69073540679f06fd8be716b0a47c28d8805ccde5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a03041a8f788ba1a57ab3e65e9bd1bae7cd014c48355ee76dc18ff35b95bdf7cd2888397111dd49c0c42f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -178,8 +308,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0913733cbf9c11709c2db4c1998d1cb8c29de792cb947c5c170105fcf0fd3e7a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4d2edbca7bd57f264074abdc48d26795e0489ecde17a53eed236af7e24d00926",
-        "network" : "EIP158",
+        "lastblockhash" : "0xd13be9ec2690f4381bbc5277cb1cdf67572472306fb478d9add9be40db65262b",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec8000a",
@@ -231,10 +361,10 @@
             }
         }
     },
-    "refund_CallToSuicideStorage_d1g0v0_Frontier" : {
+    "refund_CallToSuicideStorage_d1g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideStorage_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -245,19 +375,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x5097",
-                    "hash" : "0x69cb42a956590e5566ac9cce7ebd494674f721ce4c46bcef3b663707aae13be3",
-                    "mixHash" : "0xa0aca00b61bf3715f8d85576aafcfaaa6a4b6c6a5b13c03f158f029ad85c1d7e",
-                    "nonce" : "0x856dcb7ca7723b6d",
+                    "gasUsed" : "0x5ba5",
+                    "hash" : "0x14d25674368b368b6d407558777e0fb728e630f36a17223f631a56d653aa9f6b",
+                    "mixHash" : "0x1e7b889baf2a6f3f11bca1e046211f300fccbf59a781ae0149f2e3d145ecdde5",
+                    "nonce" : "0x4fa8cecb5befbb69",
                     "number" : "0x01",
                     "parentHash" : "0xc69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52b",
-                    "receiptTrie" : "0x4aed715e223b0a97ae25f596341609129ba903602aed59256a2d23b93bdf0a3c",
-                    "stateRoot" : "0x9bcd576f06199fb445095610ff21cbf362b6f58dcd419c3b560c377803fedcc6",
+                    "receiptTrie" : "0x2baee5e20a8ba9840322a73e69073540679f06fd8be716b0a47c28d8805ccde5",
+                    "stateRoot" : "0x33502c4c63922fca6b527f387ed8442a005b326575fcad3cc5a61ea9f3dfdef2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bcd576f06199fb445095610ff21cbf362b6f58dcd419c3b560c377803fedcc6a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca04aed715e223b0a97ae25f596341609129ba903602aed59256a2d23b93bdf0a3cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250978203e880a0a0aca00b61bf3715f8d85576aafcfaaa6a4b6c6a5b13c03f158f029ad85c1d7e88856dcb7ca7723b6df882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa033502c4c63922fca6b527f387ed8442a005b326575fcad3cc5a61ea9f3dfdef2a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca02baee5e20a8ba9840322a73e69073540679f06fd8be716b0a47c28d8805ccde5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a01e7b889baf2a6f3f11bca1e046211f300fccbf59a781ae0149f2e3d145ecdde5884fa8cecb5befbb69f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -294,8 +424,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0913733cbf9c11709c2db4c1998d1cb8c29de792cb947c5c170105fcf0fd3e7a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x69cb42a956590e5566ac9cce7ebd494674f721ce4c46bcef3b663707aae13be3",
-        "network" : "Frontier",
+        "lastblockhash" : "0x14d25674368b368b6d407558777e0fb728e630f36a17223f631a56d653aa9f6b",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec8000a",
@@ -307,14 +437,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f45097",
+                "balance" : "0x4563918244f45ba5",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x05f5905f",
+                "balance" : "0x05f58551",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -347,10 +477,10 @@
             }
         }
     },
-    "refund_CallToSuicideStorage_d1g0v0_Homestead" : {
+    "refund_CallToSuicideStorage_d1g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideStorage_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -362,9 +492,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5097",
-                    "hash" : "0xbdbc576c903d353f3287185c360d582fe9a531075962414f26df568b7d810d53",
-                    "mixHash" : "0x3c34b491f4395e3b2b447a588fe544e615849769e30ab7ed71fad097898341be",
-                    "nonce" : "0x46a4d7a24fd64745",
+                    "hash" : "0xf2597c8e3aecbe322d45a0fb81cb424bac17b0add05d3be8016cccf024680825",
+                    "mixHash" : "0xd6e8edfb5d21d4bd48848db3ae1ceb56161d0f18dbe8a5ad3a41f0defebb5d57",
+                    "nonce" : "0xbd5d1485ef155108",
                     "number" : "0x01",
                     "parentHash" : "0xc69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52b",
                     "receiptTrie" : "0x4aed715e223b0a97ae25f596341609129ba903602aed59256a2d23b93bdf0a3c",
@@ -373,7 +503,7 @@
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bcd576f06199fb445095610ff21cbf362b6f58dcd419c3b560c377803fedcc6a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca04aed715e223b0a97ae25f596341609129ba903602aed59256a2d23b93bdf0a3cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250978203e880a03c34b491f4395e3b2b447a588fe544e615849769e30ab7ed71fad097898341be8846a4d7a24fd64745f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bcd576f06199fb445095610ff21cbf362b6f58dcd419c3b560c377803fedcc6a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca04aed715e223b0a97ae25f596341609129ba903602aed59256a2d23b93bdf0a3cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250978203e880a0d6e8edfb5d21d4bd48848db3ae1ceb56161d0f18dbe8a5ad3a41f0defebb5d5788bd5d1485ef155108f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -410,8 +540,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0913733cbf9c11709c2db4c1998d1cb8c29de792cb947c5c170105fcf0fd3e7a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbdbc576c903d353f3287185c360d582fe9a531075962414f26df568b7d810d53",
-        "network" : "Homestead",
+        "lastblockhash" : "0xf2597c8e3aecbe322d45a0fb81cb424bac17b0add05d3be8016cccf024680825",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec8000a",
@@ -463,10 +593,10 @@
             }
         }
     },
-    "refund_CallToSuicideStorage_d1g0v0_Metropolis" : {
+    "refund_CallToSuicideStorage_d1g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideStorage_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -477,19 +607,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x5ba5",
-                    "hash" : "0xf12f16c92724cd6e15488936aee876e9bedb072dddaef07e301c4e8ac314015b",
-                    "mixHash" : "0x2452dd9738038b5caa69622a310aee53711fd7266d7d870c58a9b91a1887022e",
-                    "nonce" : "0x3108cfd311829ba8",
+                    "gasUsed" : "0x5097",
+                    "hash" : "0x54a8ca036700a24b6252e1c0878cdad3f2cfe74c373bb5d2d7209fe32909b269",
+                    "mixHash" : "0xc73f852b9916ba0f6c394b0ddffeaed670e654e83f7519ab41adc17209f9ba64",
+                    "nonce" : "0x2e0d5af83d40ba32",
                     "number" : "0x01",
                     "parentHash" : "0xc69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52b",
-                    "receiptTrie" : "0x72266a13e75386db59178ac5409794ca14df029795264ddc46ffbe93be70ea6f",
-                    "stateRoot" : "0x55751195e47002db8dda08b2db5399c1b0b949b75930a90ac6112785159a0d78",
+                    "receiptTrie" : "0x4aed715e223b0a97ae25f596341609129ba903602aed59256a2d23b93bdf0a3c",
+                    "stateRoot" : "0x9bcd576f06199fb445095610ff21cbf362b6f58dcd419c3b560c377803fedcc6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055751195e47002db8dda08b2db5399c1b0b949b75930a90ac6112785159a0d78a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca072266a13e75386db59178ac5409794ca14df029795264ddc46ffbe93be70ea6fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a02452dd9738038b5caa69622a310aee53711fd7266d7d870c58a9b91a1887022e883108cfd311829ba8f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bcd576f06199fb445095610ff21cbf362b6f58dcd419c3b560c377803fedcc6a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca04aed715e223b0a97ae25f596341609129ba903602aed59256a2d23b93bdf0a3cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250978203e880a0c73f852b9916ba0f6c394b0ddffeaed670e654e83f7519ab41adc17209f9ba64882e0d5af83d40ba32f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -526,16 +656,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0913733cbf9c11709c2db4c1998d1cb8c29de792cb947c5c170105fcf0fd3e7a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf12f16c92724cd6e15488936aee876e9bedb072dddaef07e301c4e8ac314015b",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x54a8ca036700a24b6252e1c0878cdad3f2cfe74c373bb5d2d7209fe32909b269",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec8000a",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600055",
@@ -546,14 +669,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f45ba5",
+                "balance" : "0x4563918244f45097",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x05f58551",
+                "balance" : "0x05f5905f",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice_d0g0v0.json
index f255280ef..6461ba90f 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "refund_CallToSuicideTwice_d0g0v0_EIP150" : {
+    "refund_CallToSuicideTwice_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideTwice_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x7023",
-                    "hash" : "0x1a4439be9f750d474f930caae21c821d8af4298574fb08a984e60ef481f55358",
-                    "mixHash" : "0xfaecee718e4318ffc4f0f1c5a57ba556e69d556eb867108b3d90193ed1c4defc",
-                    "nonce" : "0xca66f080fe2fd85a",
+                    "hash" : "0x6c56dc05e1c1dd50b43a4f40e86e54b671203245304d7cf5b9ba5fdeaf54a6e1",
+                    "mixHash" : "0x43df69cdb77873cd188ce3e11c53228c1aedbe0aab8db5275ffe1f991be1a7dc",
+                    "nonce" : "0x7b0269f318faad6c",
                     "number" : "0x01",
                     "parentHash" : "0x3610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890",
-                    "receiptTrie" : "0xcc7693c847cdc56758df9982978123d487ee7ffb664419ec37d37cb4fa7a955a",
-                    "stateRoot" : "0x341e95489d90215008401ce6f347594c024e61d179f6efd9422d84401ce614a1",
+                    "receiptTrie" : "0xcc234505231854e6860b10f3d2280258115e7fe77c2c547bacfbfb072e8b97b5",
+                    "stateRoot" : "0xa7844b3d724734c4deaa566049ed005299587b991abb43ce7a83e1d236e20bba",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341e95489d90215008401ce6f347594c024e61d179f6efd9422d84401ce614a1a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0cc7693c847cdc56758df9982978123d487ee7ffb664419ec37d37cb4fa7a955ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808270238203e880a0faecee718e4318ffc4f0f1c5a57ba556e69d556eb867108b3d90193ed1c4defc88ca66f080fe2fd85af882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7844b3d724734c4deaa566049ed005299587b991abb43ce7a83e1d236e20bbaa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0cc234505231854e6860b10f3d2280258115e7fe77c2c547bacfbfb072e8b97b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808270238203e880a043df69cdb77873cd188ce3e11c53228c1aedbe0aab8db5275ffe1f991be1a7dc887b0269f318faad6cf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fb4a1bcb6ce4b567b2bb523ff56ddf4048f92fe9cf0c3862a1a11234a5e433fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1a4439be9f750d474f930caae21c821d8af4298574fb08a984e60ef481f55358",
-        "network" : "EIP150",
+        "lastblockhash" : "0x6c56dc05e1c1dd50b43a4f40e86e54b671203245304d7cf5b9ba5fdeaf54a6e1",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f16000556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1",
@@ -122,10 +129,140 @@
             }
         }
     },
-    "refund_CallToSuicideTwice_d0g0v0_EIP158" : {
+    "refund_CallToSuicideTwice_d0g0v0_Constantinople" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideTwice_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x7023",
+                    "hash" : "0xb10e87a43c932dc2d347321fb1b3472bddd72642e7b3beac2e832baad80e9d32",
+                    "mixHash" : "0x9204b199e3a1597c7891fd746d0d4a9f26d86968c383c47d9e5fa3f938efd18d",
+                    "nonce" : "0x2ec5063172539b25",
+                    "number" : "0x01",
+                    "parentHash" : "0x3610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890",
+                    "receiptTrie" : "0xcc234505231854e6860b10f3d2280258115e7fe77c2c547bacfbfb072e8b97b5",
+                    "stateRoot" : "0xa7844b3d724734c4deaa566049ed005299587b991abb43ce7a83e1d236e20bba",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7844b3d724734c4deaa566049ed005299587b991abb43ce7a83e1d236e20bbaa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0cc234505231854e6860b10f3d2280258115e7fe77c2c547bacfbfb072e8b97b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808270238203e880a09204b199e3a1597c7891fd746d0d4a9f26d86968c383c47d9e5fa3f938efd18d882ec5063172539b25f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "transactions" : [
+                    {
+                        "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
+                        "gasLimit" : "0x989680",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7",
+                        "s" : "0x661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x3610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8fb4a1bcb6ce4b567b2bb523ff56ddf4048f92fe9cf0c3862a1a11234a5e433f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fb4a1bcb6ce4b567b2bb523ff56ddf4048f92fe9cf0c3862a1a11234a5e433fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xb10e87a43c932dc2d347321fb1b3472bddd72642e7b3beac2e832baad80e9d32",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f16000556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f47023",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f570d3",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f16000556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f5e100",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        }
+    },
+    "refund_CallToSuicideTwice_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideTwice_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -137,9 +274,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x7023",
-                    "hash" : "0xc038787d5bf63429d550cc838fc35dc0ef59952a02dcd6e404953af2619840b3",
-                    "mixHash" : "0xd10970d05a31a6ec92e32e3734559fa4741957b5d116c522c699934aa357b799",
-                    "nonce" : "0x2f5af6b6177876c7",
+                    "hash" : "0x8d2347145e6f11f26d6a061637404c16b608b141876b393ef993a468235696c1",
+                    "mixHash" : "0x59c97057a77b17a9f3cf00c1f46c3a959f44e955663089ac9823ad3b3e23d19e",
+                    "nonce" : "0x25f082fd868eb1f3",
                     "number" : "0x01",
                     "parentHash" : "0x3610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890",
                     "receiptTrie" : "0xcc7693c847cdc56758df9982978123d487ee7ffb664419ec37d37cb4fa7a955a",
@@ -148,7 +285,7 @@
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341e95489d90215008401ce6f347594c024e61d179f6efd9422d84401ce614a1a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0cc7693c847cdc56758df9982978123d487ee7ffb664419ec37d37cb4fa7a955ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808270238203e880a0d10970d05a31a6ec92e32e3734559fa4741957b5d116c522c699934aa357b799882f5af6b6177876c7f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341e95489d90215008401ce6f347594c024e61d179f6efd9422d84401ce614a1a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0cc7693c847cdc56758df9982978123d487ee7ffb664419ec37d37cb4fa7a955ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808270238203e880a059c97057a77b17a9f3cf00c1f46c3a959f44e955663089ac9823ad3b3e23d19e8825f082fd868eb1f3f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -185,8 +322,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fb4a1bcb6ce4b567b2bb523ff56ddf4048f92fe9cf0c3862a1a11234a5e433fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc038787d5bf63429d550cc838fc35dc0ef59952a02dcd6e404953af2619840b3",
-        "network" : "EIP158",
+        "lastblockhash" : "0x8d2347145e6f11f26d6a061637404c16b608b141876b393ef993a468235696c1",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -245,10 +382,10 @@
             }
         }
     },
-    "refund_CallToSuicideTwice_d0g0v0_Frontier" : {
+    "refund_CallToSuicideTwice_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideTwice_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -259,19 +396,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x50d9",
-                    "hash" : "0x708064ba1610baaea76d93f9c04c393c7987d6463f4af20997c03e6b5651e2f7",
-                    "mixHash" : "0x130afc41e30a61c50420e793c7aa4f9204ba059a6a4868072eb74b53d10aa174",
-                    "nonce" : "0x63624db9c449572f",
+                    "gasUsed" : "0x7023",
+                    "hash" : "0x8af43faf7048701e5ee86174c76fac3d1433ab80c44144cc6ba9145ba4d0018f",
+                    "mixHash" : "0xbfc448b9020037b26f4df8f72a519cc8e225d1836b2d02367ef0ce2c84bbb9b0",
+                    "nonce" : "0xbee9174a8aea8f02",
                     "number" : "0x01",
                     "parentHash" : "0x3610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890",
-                    "receiptTrie" : "0x6c39c4ae9a27f18798320970d374ce77eb09fa12e20c1c1b53f382625f5a740c",
-                    "stateRoot" : "0x8ec3529863fcb5a2ca33cb0adce2e735234c57f6afd6b9598b92c348b6851eda",
+                    "receiptTrie" : "0xcc7693c847cdc56758df9982978123d487ee7ffb664419ec37d37cb4fa7a955a",
+                    "stateRoot" : "0x341e95489d90215008401ce6f347594c024e61d179f6efd9422d84401ce614a1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ec3529863fcb5a2ca33cb0adce2e735234c57f6afd6b9598b92c348b6851edaa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba06c39c4ae9a27f18798320970d374ce77eb09fa12e20c1c1b53f382625f5a740cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250d98203e880a0130afc41e30a61c50420e793c7aa4f9204ba059a6a4868072eb74b53d10aa1748863624db9c449572ff882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341e95489d90215008401ce6f347594c024e61d179f6efd9422d84401ce614a1a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0cc7693c847cdc56758df9982978123d487ee7ffb664419ec37d37cb4fa7a955ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808270238203e880a0bfc448b9020037b26f4df8f72a519cc8e225d1836b2d02367ef0ce2c84bbb9b088bee9174a8aea8f02f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -308,31 +445,38 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fb4a1bcb6ce4b567b2bb523ff56ddf4048f92fe9cf0c3862a1a11234a5e433fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x708064ba1610baaea76d93f9c04c393c7987d6463f4af20997c03e6b5651e2f7",
-        "network" : "Frontier",
+        "lastblockhash" : "0x8af43faf7048701e5ee86174c76fac3d1433ab80c44144cc6ba9145ba4d0018f",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x1bc16d674ec8000a",
+                "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f16000556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1",
                 "nonce" : "0x00",
                 "storage" : {
-                    "0x00" : "0x01",
                     "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f450d9",
+                "balance" : "0x4563918244f47023",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x05f5901d",
+                "balance" : "0x05f570d3",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
             }
         },
         "pre" : {
@@ -361,10 +505,10 @@
             }
         }
     },
-    "refund_CallToSuicideTwice_d0g0v0_Homestead" : {
+    "refund_CallToSuicideTwice_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideTwice_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -376,9 +520,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x50d9",
-                    "hash" : "0xd4e517e9e5c5f188127543974e51a69a749a4e98e0c6f307e674a9439987f0ed",
-                    "mixHash" : "0x71d28c41084b395359697ee4b61899080d903638a62ae38444e06f1cec972bc2",
-                    "nonce" : "0xdc7e2fed5efd5a64",
+                    "hash" : "0xecafc282e849c02ded1e4c5a99a2b6a251cea265a106f7ed3908f08c305c408c",
+                    "mixHash" : "0xe34c3ed6038dea5c1c75eda51b09a5ae326f720bd47b4b7e745f917b25010bcb",
+                    "nonce" : "0xfef61a59af61fadb",
                     "number" : "0x01",
                     "parentHash" : "0x3610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890",
                     "receiptTrie" : "0x6c39c4ae9a27f18798320970d374ce77eb09fa12e20c1c1b53f382625f5a740c",
@@ -387,7 +531,7 @@
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ec3529863fcb5a2ca33cb0adce2e735234c57f6afd6b9598b92c348b6851edaa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba06c39c4ae9a27f18798320970d374ce77eb09fa12e20c1c1b53f382625f5a740cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250d98203e880a071d28c41084b395359697ee4b61899080d903638a62ae38444e06f1cec972bc288dc7e2fed5efd5a64f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ec3529863fcb5a2ca33cb0adce2e735234c57f6afd6b9598b92c348b6851edaa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba06c39c4ae9a27f18798320970d374ce77eb09fa12e20c1c1b53f382625f5a740cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250d98203e880a0e34c3ed6038dea5c1c75eda51b09a5ae326f720bd47b4b7e745f917b25010bcb88fef61a59af61fadbf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -424,8 +568,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fb4a1bcb6ce4b567b2bb523ff56ddf4048f92fe9cf0c3862a1a11234a5e433fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd4e517e9e5c5f188127543974e51a69a749a4e98e0c6f307e674a9439987f0ed",
-        "network" : "Homestead",
+        "lastblockhash" : "0xecafc282e849c02ded1e4c5a99a2b6a251cea265a106f7ed3908f08c305c408c",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec8000a",
@@ -477,10 +621,10 @@
             }
         }
     },
-    "refund_CallToSuicideTwice_d0g0v0_Metropolis" : {
+    "refund_CallToSuicideTwice_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/stRefundTest/refund_CallToSuicideTwice_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -491,19 +635,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x7023",
-                    "hash" : "0x4642a6df6af8b22cfbebfd18525cbe9b429389ceb7e8894c87810f728969c0cd",
-                    "mixHash" : "0xee3e66ace88cd1fc2353c45a809cc35fc44e30b5a1630da6e5ead8563b4133df",
-                    "nonce" : "0x516f9834bdf65287",
+                    "gasUsed" : "0x50d9",
+                    "hash" : "0x58c6e053b5e7aedc1b72c1046b19ca8b862f2453b4bd1239f87088feaf4b673b",
+                    "mixHash" : "0xc58694b5c262fe4140f8a7e8e8e6afa1ed4a52f0927e37c9b963a389872a5c72",
+                    "nonce" : "0x12205d74a5d897a6",
                     "number" : "0x01",
                     "parentHash" : "0x3610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890",
-                    "receiptTrie" : "0xcc234505231854e6860b10f3d2280258115e7fe77c2c547bacfbfb072e8b97b5",
-                    "stateRoot" : "0xa7844b3d724734c4deaa566049ed005299587b991abb43ce7a83e1d236e20bba",
+                    "receiptTrie" : "0x6c39c4ae9a27f18798320970d374ce77eb09fa12e20c1c1b53f382625f5a740c",
+                    "stateRoot" : "0x8ec3529863fcb5a2ca33cb0adce2e735234c57f6afd6b9598b92c348b6851eda",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7844b3d724734c4deaa566049ed005299587b991abb43ce7a83e1d236e20bbaa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0cc234505231854e6860b10f3d2280258115e7fe77c2c547bacfbfb072e8b97b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808270238203e880a0ee3e66ace88cd1fc2353c45a809cc35fc44e30b5a1630da6e5ead8563b4133df88516f9834bdf65287f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ec3529863fcb5a2ca33cb0adce2e735234c57f6afd6b9598b92c348b6851edaa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba06c39c4ae9a27f18798320970d374ce77eb09fa12e20c1c1b53f382625f5a740cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250d98203e880a0c58694b5c262fe4140f8a7e8e8e6afa1ed4a52f0927e37c9b963a389872a5c728812205d74a5d897a6f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -540,45 +684,31 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fb4a1bcb6ce4b567b2bb523ff56ddf4048f92fe9cf0c3862a1a11234a5e433fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4642a6df6af8b22cfbebfd18525cbe9b429389ceb7e8894c87810f728969c0cd",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x58c6e053b5e7aedc1b72c1046b19ca8b862f2453b4bd1239f87088feaf4b673b",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a764000a",
+                "balance" : "0x1bc16d674ec8000a",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f16000556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x00" : "0x01",
                     "0x01" : "0x01"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f47023",
+                "balance" : "0x4563918244f450d9",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x05f570d3",
+                "balance" : "0x05f5901d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x01" : "0x01"
-                }
             }
         },
         "pre" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice_d1g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice_d1g0v0.json
index be2361b0a..bdcca5741 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice_d1g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice_d1g0v0.json
@@ -1,8 +1,8 @@
 {
-    "refund_CallToSuicideTwice_d1g0v0_EIP150" : {
+    "refund_CallToSuicideTwice_d1g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideTwice_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x6fe9",
-                    "hash" : "0xc288e6326cbcde8efe0e382ea9e3551d147124c4abb103e6bb871cb3d66634c5",
-                    "mixHash" : "0x458a47d6362b9c927bd5013eb0ae945912adabcd74437590f4ba8c05e4a8612b",
-                    "nonce" : "0x7ae69319dd5470ac",
+                    "hash" : "0x786d7dff0a3ba8647d0bdfcff6986a7431ce2d71b9d11ad46b5ab5a0644c29c5",
+                    "mixHash" : "0x69961bb71aec51effa02a9b5c3a2a1d5baa7186825179160070ce5ca953150f7",
+                    "nonce" : "0x3ac8ead3d8649c47",
                     "number" : "0x01",
                     "parentHash" : "0x3610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890",
-                    "receiptTrie" : "0x246e9d71109080f2ce4bec85a9afab8ab9aaa607526e8be0535b1ea4883c721a",
-                    "stateRoot" : "0x7d4035ea114027ffd2e3043241ffa09920ea4befae96eb89abc8010c9eecfe7e",
+                    "receiptTrie" : "0x84a20fd94e408e2dceb341b74453fe57abdfb71b3b38a438511416300df2a9e4",
+                    "stateRoot" : "0xf0220ad08518502bd29c629607187795ed8aa4b8cf41374cbf53cdcafabce05d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d4035ea114027ffd2e3043241ffa09920ea4befae96eb89abc8010c9eecfe7ea06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca0246e9d71109080f2ce4bec85a9afab8ab9aaa607526e8be0535b1ea4883c721ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826fe98203e880a0458a47d6362b9c927bd5013eb0ae945912adabcd74437590f4ba8c05e4a8612b887ae69319dd5470acf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f0220ad08518502bd29c629607187795ed8aa4b8cf41374cbf53cdcafabce05da06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca084a20fd94e408e2dceb341b74453fe57abdfb71b3b38a438511416300df2a9e4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826fe98203e880a069961bb71aec51effa02a9b5c3a2a1d5baa7186825179160070ce5ca953150f7883ac8ead3d8649c47f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fb4a1bcb6ce4b567b2bb523ff56ddf4048f92fe9cf0c3862a1a11234a5e433fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc288e6326cbcde8efe0e382ea9e3551d147124c4abb103e6bb871cb3d66634c5",
-        "network" : "EIP150",
+        "lastblockhash" : "0x786d7dff0a3ba8647d0bdfcff6986a7431ce2d71b9d11ad46b5ab5a0644c29c5",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec8000a",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f16000556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1",
@@ -115,10 +122,10 @@
             }
         }
     },
-    "refund_CallToSuicideTwice_d1g0v0_EIP158" : {
+    "refund_CallToSuicideTwice_d1g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideTwice_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -130,9 +137,132 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x6fe9",
-                    "hash" : "0xb26962c32d1d880c53fbbac0d17817645a8b028374a097c8e5f3c2cd1183cc79",
-                    "mixHash" : "0x585b72ab7141b2bc436cb064fb229ccb7813776c656a229407ec7cdce936c082",
-                    "nonce" : "0x398712a96f706b9c",
+                    "hash" : "0xc77a32f526c21059ad453ff3160c439f3f0eaaca00f37a5a668a84a5a116f90a",
+                    "mixHash" : "0x7601e1e921981503b3d01967d7a25740a4cd03937aed423712ffed36dad78f15",
+                    "nonce" : "0xeff7ba55f1f42a8a",
+                    "number" : "0x01",
+                    "parentHash" : "0x3610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890",
+                    "receiptTrie" : "0x84a20fd94e408e2dceb341b74453fe57abdfb71b3b38a438511416300df2a9e4",
+                    "stateRoot" : "0xf0220ad08518502bd29c629607187795ed8aa4b8cf41374cbf53cdcafabce05d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f0220ad08518502bd29c629607187795ed8aa4b8cf41374cbf53cdcafabce05da06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca084a20fd94e408e2dceb341b74453fe57abdfb71b3b38a438511416300df2a9e4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826fe98203e880a07601e1e921981503b3d01967d7a25740a4cd03937aed423712ffed36dad78f1588eff7ba55f1f42a8af882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "transactions" : [
+                    {
+                        "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
+                        "gasLimit" : "0x989680",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x7cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628",
+                        "s" : "0x7e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bcc",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x3610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8fb4a1bcb6ce4b567b2bb523ff56ddf4048f92fe9cf0c3862a1a11234a5e433f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fb4a1bcb6ce4b567b2bb523ff56ddf4048f92fe9cf0c3862a1a11234a5e433fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc77a32f526c21059ad453ff3160c439f3f0eaaca00f37a5a668a84a5a116f90a",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x1bc16d674ec8000a",
+                "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f16000556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01",
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f46fe9",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f5710d",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f16000556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f5e100",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        }
+    },
+    "refund_CallToSuicideTwice_d1g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideTwice_d1g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x6fe9",
+                    "hash" : "0xa2eeb74f57c56835fbb5d366772659741d78ac678341f2df6c0f1bb7c070b3db",
+                    "mixHash" : "0x2744fc36512527f98ad94b2118109f5fc224f7ca4e69fd7996c02a26e009f493",
+                    "nonce" : "0xeca5a6885cb74d56",
                     "number" : "0x01",
                     "parentHash" : "0x3610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890",
                     "receiptTrie" : "0x246e9d71109080f2ce4bec85a9afab8ab9aaa607526e8be0535b1ea4883c721a",
@@ -141,7 +271,7 @@
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d4035ea114027ffd2e3043241ffa09920ea4befae96eb89abc8010c9eecfe7ea06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca0246e9d71109080f2ce4bec85a9afab8ab9aaa607526e8be0535b1ea4883c721ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826fe98203e880a0585b72ab7141b2bc436cb064fb229ccb7813776c656a229407ec7cdce936c08288398712a96f706b9cf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d4035ea114027ffd2e3043241ffa09920ea4befae96eb89abc8010c9eecfe7ea06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca0246e9d71109080f2ce4bec85a9afab8ab9aaa607526e8be0535b1ea4883c721ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826fe98203e880a02744fc36512527f98ad94b2118109f5fc224f7ca4e69fd7996c02a26e009f49388eca5a6885cb74d56f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -178,8 +308,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fb4a1bcb6ce4b567b2bb523ff56ddf4048f92fe9cf0c3862a1a11234a5e433fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb26962c32d1d880c53fbbac0d17817645a8b028374a097c8e5f3c2cd1183cc79",
-        "network" : "EIP158",
+        "lastblockhash" : "0xa2eeb74f57c56835fbb5d366772659741d78ac678341f2df6c0f1bb7c070b3db",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec8000a",
@@ -231,10 +361,10 @@
             }
         }
     },
-    "refund_CallToSuicideTwice_d1g0v0_Frontier" : {
+    "refund_CallToSuicideTwice_d1g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideTwice_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -245,19 +375,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x50b9",
-                    "hash" : "0xe214de8182b82795bd3d24aaccec635e40d8dfd67bf8ceb416042b3fc22f859f",
-                    "mixHash" : "0x312c9d4092cc02ecc6eb9a3afbc7c650be59d341ffac04a8d848fbdff7f27764",
-                    "nonce" : "0x21f3ff31e330f269",
+                    "gasUsed" : "0x6fe9",
+                    "hash" : "0x957a190efd14719638384bd772c75dff000da1b02c874b0e218a1edcc50e6ca7",
+                    "mixHash" : "0xf197b04dcad4f1845bbadd270565633c851a509fd5f5e77b7dd3f6654f035a04",
+                    "nonce" : "0x21a26d7017c98990",
                     "number" : "0x01",
                     "parentHash" : "0x3610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890",
-                    "receiptTrie" : "0x2e1c169e9a2bcf584996756f33b26bf590b960f174105957812abd9b8f06b472",
-                    "stateRoot" : "0x81eabe50814ae23a0b826f8c427a7a2e7ee2d77a1a135ab8da4a270c1285856d",
+                    "receiptTrie" : "0x246e9d71109080f2ce4bec85a9afab8ab9aaa607526e8be0535b1ea4883c721a",
+                    "stateRoot" : "0x7d4035ea114027ffd2e3043241ffa09920ea4befae96eb89abc8010c9eecfe7e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa081eabe50814ae23a0b826f8c427a7a2e7ee2d77a1a135ab8da4a270c1285856da06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca02e1c169e9a2bcf584996756f33b26bf590b960f174105957812abd9b8f06b472b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250b98203e880a0312c9d4092cc02ecc6eb9a3afbc7c650be59d341ffac04a8d848fbdff7f277648821f3ff31e330f269f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d4035ea114027ffd2e3043241ffa09920ea4befae96eb89abc8010c9eecfe7ea06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca0246e9d71109080f2ce4bec85a9afab8ab9aaa607526e8be0535b1ea4883c721ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826fe98203e880a0f197b04dcad4f1845bbadd270565633c851a509fd5f5e77b7dd3f6654f035a048821a26d7017c98990f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -294,8 +424,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fb4a1bcb6ce4b567b2bb523ff56ddf4048f92fe9cf0c3862a1a11234a5e433fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe214de8182b82795bd3d24aaccec635e40d8dfd67bf8ceb416042b3fc22f859f",
-        "network" : "Frontier",
+        "lastblockhash" : "0x957a190efd14719638384bd772c75dff000da1b02c874b0e218a1edcc50e6ca7",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec8000a",
@@ -307,14 +437,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f450b9",
+                "balance" : "0x4563918244f46fe9",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x05f5903d",
+                "balance" : "0x05f5710d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -347,10 +477,10 @@
             }
         }
     },
-    "refund_CallToSuicideTwice_d1g0v0_Homestead" : {
+    "refund_CallToSuicideTwice_d1g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideTwice_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -362,9 +492,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x50b9",
-                    "hash" : "0x71d9472303f34dae9cf100cfda1a32d1e7e617aadcd928f5f218cc675ba7ce6a",
-                    "mixHash" : "0xbdce65bf7129f2b6f22e6196ef51d3bebe4929e11eb3e21132b00b62730a6093",
-                    "nonce" : "0x75993033ebebfa31",
+                    "hash" : "0x09bebe87f3c386fd7e0df30c60efb836906b0994429e7777dc0748f3da49a905",
+                    "mixHash" : "0xbca91893eb3cadb111da16a52aa2a07ebf279765578dc38c698a55bf9ff3f936",
+                    "nonce" : "0xc2798d7a1ca96a44",
                     "number" : "0x01",
                     "parentHash" : "0x3610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890",
                     "receiptTrie" : "0x2e1c169e9a2bcf584996756f33b26bf590b960f174105957812abd9b8f06b472",
@@ -373,7 +503,7 @@
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa081eabe50814ae23a0b826f8c427a7a2e7ee2d77a1a135ab8da4a270c1285856da06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca02e1c169e9a2bcf584996756f33b26bf590b960f174105957812abd9b8f06b472b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250b98203e880a0bdce65bf7129f2b6f22e6196ef51d3bebe4929e11eb3e21132b00b62730a60938875993033ebebfa31f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa081eabe50814ae23a0b826f8c427a7a2e7ee2d77a1a135ab8da4a270c1285856da06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca02e1c169e9a2bcf584996756f33b26bf590b960f174105957812abd9b8f06b472b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250b98203e880a0bca91893eb3cadb111da16a52aa2a07ebf279765578dc38c698a55bf9ff3f93688c2798d7a1ca96a44f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -410,8 +540,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fb4a1bcb6ce4b567b2bb523ff56ddf4048f92fe9cf0c3862a1a11234a5e433fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x71d9472303f34dae9cf100cfda1a32d1e7e617aadcd928f5f218cc675ba7ce6a",
-        "network" : "Homestead",
+        "lastblockhash" : "0x09bebe87f3c386fd7e0df30c60efb836906b0994429e7777dc0748f3da49a905",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec8000a",
@@ -463,10 +593,10 @@
             }
         }
     },
-    "refund_CallToSuicideTwice_d1g0v0_Metropolis" : {
+    "refund_CallToSuicideTwice_d1g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideTwice_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -477,19 +607,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x6fe9",
-                    "hash" : "0x170773886fcec06c7f52cdf1ec95260a206fb535c2497c57f9fac87217c492b0",
-                    "mixHash" : "0x8541eb2c553b5895416fc17ec4ef29c156afe24aa6da159640e5d26b023f39c3",
-                    "nonce" : "0xbd517430b78ace15",
+                    "gasUsed" : "0x50b9",
+                    "hash" : "0x301e3ef6dc6f474a6be6b223fe7bc036a417bbc072f011a3d19998615d77feae",
+                    "mixHash" : "0xba7306539acf88e3ae197ed285c512b518983c54ce8a36be0ffb98ffd54c10aa",
+                    "nonce" : "0x5ed1f658b320248d",
                     "number" : "0x01",
                     "parentHash" : "0x3610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890",
-                    "receiptTrie" : "0x84a20fd94e408e2dceb341b74453fe57abdfb71b3b38a438511416300df2a9e4",
-                    "stateRoot" : "0xf0220ad08518502bd29c629607187795ed8aa4b8cf41374cbf53cdcafabce05d",
+                    "receiptTrie" : "0x2e1c169e9a2bcf584996756f33b26bf590b960f174105957812abd9b8f06b472",
+                    "stateRoot" : "0x81eabe50814ae23a0b826f8c427a7a2e7ee2d77a1a135ab8da4a270c1285856d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f0220ad08518502bd29c629607187795ed8aa4b8cf41374cbf53cdcafabce05da06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca084a20fd94e408e2dceb341b74453fe57abdfb71b3b38a438511416300df2a9e4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826fe98203e880a08541eb2c553b5895416fc17ec4ef29c156afe24aa6da159640e5d26b023f39c388bd517430b78ace15f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa081eabe50814ae23a0b826f8c427a7a2e7ee2d77a1a135ab8da4a270c1285856da06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca02e1c169e9a2bcf584996756f33b26bf590b960f174105957812abd9b8f06b472b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250b98203e880a0ba7306539acf88e3ae197ed285c512b518983c54ce8a36be0ffb98ffd54c10aa885ed1f658b320248df882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -526,16 +656,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fb4a1bcb6ce4b567b2bb523ff56ddf4048f92fe9cf0c3862a1a11234a5e433fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x170773886fcec06c7f52cdf1ec95260a206fb535c2497c57f9fac87217c492b0",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x301e3ef6dc6f474a6be6b223fe7bc036a417bbc072f011a3d19998615d77feae",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec8000a",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f16000556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1",
@@ -546,14 +669,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f46fe9",
+                "balance" : "0x4563918244f450b9",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x05f5710d",
+                "balance" : "0x05f5903d",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_NoOOG_1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_NoOOG_1_d0g0v0.json
index 21a47f7dd..f356bf997 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_NoOOG_1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_NoOOG_1_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "refund_NoOOG_1_d0g0v0_EIP150" : {
+    "refund_NoOOG_1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_NoOOG_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x32cb",
-                    "hash" : "0xe525633dfd0797e35cbfa541db4000e1b6cbf0a26a41351203e8805d633df05e",
-                    "mixHash" : "0xcb71812d63fe45d9ea3d04d71ee8d976b1b6cf20d32c4b44c3bb31d7789eb1ff",
-                    "nonce" : "0x1a7d1927498af666",
+                    "hash" : "0x093112f4d9a08c1b8cccac042447acf5649eb3c567763a93b3b4b7fbf599555d",
+                    "mixHash" : "0x680ebd5a53773e45d6b2dec60e4f236443a607a406133063a0012cd3e664e7ab",
+                    "nonce" : "0x816cde83547243c4",
                     "number" : "0x01",
                     "parentHash" : "0x86c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489c",
-                    "receiptTrie" : "0xe42dd64bbe84c58b43411fa38a6dc55dff569c4abbc12194b550378021911e27",
-                    "stateRoot" : "0x8a3b9e13b008727c13709eb12a2d07bdddcfd4a7fc9a37dbacdd3bc722d7d5ed",
+                    "receiptTrie" : "0xbf746beefa19da059d5810cb7b32cde1e5afa402222d0cbeea17736d3f724c70",
+                    "stateRoot" : "0xa7e86504ca0688e4f195b6640b3028cf6fb56739ccda34e94a90fae8300e871c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xdff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a086c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a3b9e13b008727c13709eb12a2d07bdddcfd4a7fc9a37dbacdd3bc722d7d5eda0dff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8ca0e42dd64bbe84c58b43411fa38a6dc55dff569c4abbc12194b550378021911e27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408232cb8203e880a0cb71812d63fe45d9ea3d04d71ee8d976b1b6cf20d32c4b44c3bb31d7789eb1ff881a7d1927498af666f861f85f800182659694095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c44cd47f9661b5eb3d291053e0a2a2b1d63680a11abfd203a27cf7254a0e974fa01a548adb89e3a5ec1c812e810b127924c40de8e7ddd7c6a84b52e132481b69a0c0",
+                "rlp" : "0xf9025ef901f7a086c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7e86504ca0688e4f195b6640b3028cf6fb56739ccda34e94a90fae8300e871ca0dff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8ca0bf746beefa19da059d5810cb7b32cde1e5afa402222d0cbeea17736d3f724c70b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408232cb8203e880a0680ebd5a53773e45d6b2dec60e4f236443a607a406133063a0012cd3e664e7ab88816cde83547243c4f861f85f800182659694095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c44cd47f9661b5eb3d291053e0a2a2b1d63680a11abfd203a27cf7254a0e974fa01a548adb89e3a5ec1c812e810b127924c40de8e7ddd7c6a84b52e132481b69a0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0922b9a9d20dd323e25ba37936527d2e5d98df97bb97635cbaf4f599840323170a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe525633dfd0797e35cbfa541db4000e1b6cbf0a26a41351203e8805d633df05e",
-        "network" : "EIP150",
+        "lastblockhash" : "0x093112f4d9a08c1b8cccac042447acf5649eb3c567763a93b3b4b7fbf599555d",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600155",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "refund_NoOOG_1_d0g0v0_EIP158" : {
+    "refund_NoOOG_1_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_NoOOG_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x32cb",
-                    "hash" : "0xe1a6d19522b9f8da1a67a3e1de878bcddf4f79428e07de96eeaddc04c0df2b57",
-                    "mixHash" : "0x5de7f05b1bf4d855f9b07070fd1cd17bc4ec0cb02ca6cd8dc0cec1a605308b91",
-                    "nonce" : "0x4c01a6c7516f64b8",
+                    "hash" : "0xf9bd0c865208eceeb29124dd6773e72fc054f2ee4bc6aa5b6ebea90802b5989c",
+                    "mixHash" : "0xb61467a74301e0019b620a2f407025d6971a5f9406932d78abf220ff0a20ca92",
+                    "nonce" : "0xe22cb23a83ebf4ad",
                     "number" : "0x01",
                     "parentHash" : "0x86c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489c",
-                    "receiptTrie" : "0xe42dd64bbe84c58b43411fa38a6dc55dff569c4abbc12194b550378021911e27",
-                    "stateRoot" : "0x8a3b9e13b008727c13709eb12a2d07bdddcfd4a7fc9a37dbacdd3bc722d7d5ed",
+                    "receiptTrie" : "0xbf746beefa19da059d5810cb7b32cde1e5afa402222d0cbeea17736d3f724c70",
+                    "stateRoot" : "0xa7e86504ca0688e4f195b6640b3028cf6fb56739ccda34e94a90fae8300e871c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xdff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a086c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a3b9e13b008727c13709eb12a2d07bdddcfd4a7fc9a37dbacdd3bc722d7d5eda0dff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8ca0e42dd64bbe84c58b43411fa38a6dc55dff569c4abbc12194b550378021911e27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408232cb8203e880a05de7f05b1bf4d855f9b07070fd1cd17bc4ec0cb02ca6cd8dc0cec1a605308b91884c01a6c7516f64b8f861f85f800182659694095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c44cd47f9661b5eb3d291053e0a2a2b1d63680a11abfd203a27cf7254a0e974fa01a548adb89e3a5ec1c812e810b127924c40de8e7ddd7c6a84b52e132481b69a0c0",
+                "rlp" : "0xf9025ef901f7a086c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7e86504ca0688e4f195b6640b3028cf6fb56739ccda34e94a90fae8300e871ca0dff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8ca0bf746beefa19da059d5810cb7b32cde1e5afa402222d0cbeea17736d3f724c70b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408232cb8203e880a0b61467a74301e0019b620a2f407025d6971a5f9406932d78abf220ff0a20ca9288e22cb23a83ebf4adf861f85f800182659694095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c44cd47f9661b5eb3d291053e0a2a2b1d63680a11abfd203a27cf7254a0e974fa01a548adb89e3a5ec1c812e810b127924c40de8e7ddd7c6a84b52e132481b69a0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0922b9a9d20dd323e25ba37936527d2e5d98df97bb97635cbaf4f599840323170a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe1a6d19522b9f8da1a67a3e1de878bcddf4f79428e07de96eeaddc04c0df2b57",
-        "network" : "EIP158",
+        "lastblockhash" : "0xf9bd0c865208eceeb29124dd6773e72fc054f2ee4bc6aa5b6ebea90802b5989c",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600155",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "refund_NoOOG_1_d0g0v0_Frontier" : {
+    "refund_NoOOG_1_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_NoOOG_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x32cb",
-                    "hash" : "0x1900cf52e8ed5547c4039000a670c98c127b03c9f733e19fd4730bfcda7a423e",
-                    "mixHash" : "0x8bbb080f1b87fc9ed6697adc1dee4832fdd219afd31fa885995393f076bbbd8c",
-                    "nonce" : "0x412128833d85c8b7",
+                    "hash" : "0xe53688635a31c0930a0f9307dd9cce994bab2a3f7ec352f145c8600483a4d0d5",
+                    "mixHash" : "0x7b41e1e3316024257da1ff4f5bd82e84bfde6474d930500ca83cf5f95012336b",
+                    "nonce" : "0x848a8c8eb2b3a165",
                     "number" : "0x01",
                     "parentHash" : "0x86c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489c",
                     "receiptTrie" : "0xe42dd64bbe84c58b43411fa38a6dc55dff569c4abbc12194b550378021911e27",
@@ -237,7 +251,7 @@
                     "transactionsTrie" : "0xdff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a086c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a3b9e13b008727c13709eb12a2d07bdddcfd4a7fc9a37dbacdd3bc722d7d5eda0dff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8ca0e42dd64bbe84c58b43411fa38a6dc55dff569c4abbc12194b550378021911e27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408232cb8203e880a08bbb080f1b87fc9ed6697adc1dee4832fdd219afd31fa885995393f076bbbd8c88412128833d85c8b7f861f85f800182659694095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c44cd47f9661b5eb3d291053e0a2a2b1d63680a11abfd203a27cf7254a0e974fa01a548adb89e3a5ec1c812e810b127924c40de8e7ddd7c6a84b52e132481b69a0c0",
+                "rlp" : "0xf9025ef901f7a086c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a3b9e13b008727c13709eb12a2d07bdddcfd4a7fc9a37dbacdd3bc722d7d5eda0dff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8ca0e42dd64bbe84c58b43411fa38a6dc55dff569c4abbc12194b550378021911e27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408232cb8203e880a07b41e1e3316024257da1ff4f5bd82e84bfde6474d930500ca83cf5f95012336b88848a8c8eb2b3a165f861f85f800182659694095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c44cd47f9661b5eb3d291053e0a2a2b1d63680a11abfd203a27cf7254a0e974fa01a548adb89e3a5ec1c812e810b127924c40de8e7ddd7c6a84b52e132481b69a0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0922b9a9d20dd323e25ba37936527d2e5d98df97bb97635cbaf4f599840323170a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1900cf52e8ed5547c4039000a670c98c127b03c9f733e19fd4730bfcda7a423e",
-        "network" : "Frontier",
+        "lastblockhash" : "0xe53688635a31c0930a0f9307dd9cce994bab2a3f7ec352f145c8600483a4d0d5",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -317,10 +331,10 @@
             }
         }
     },
-    "refund_NoOOG_1_d0g0v0_Homestead" : {
+    "refund_NoOOG_1_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_NoOOG_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x32cb",
-                    "hash" : "0xd1a2bb0be236f2883061ef66a15dd398ec64d6d2c624306dd7782d43820b1009",
-                    "mixHash" : "0xbebfd876ec202746bfefc84715b82a9f594e85d8176684578c26d980e97a0f71",
-                    "nonce" : "0xe9def2175469b9cb",
+                    "hash" : "0x0a8d810a7376943dbd6290c9cec28227149b69c10d66780b818c29ed3a720e92",
+                    "mixHash" : "0xc59075ee25318ac7a2e643e9fe1e3201223f15d61e1f55c819f5290994bc4d72",
+                    "nonce" : "0x3233066345b16218",
                     "number" : "0x01",
                     "parentHash" : "0x86c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489c",
                     "receiptTrie" : "0xe42dd64bbe84c58b43411fa38a6dc55dff569c4abbc12194b550378021911e27",
@@ -343,7 +357,7 @@
                     "transactionsTrie" : "0xdff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a086c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a3b9e13b008727c13709eb12a2d07bdddcfd4a7fc9a37dbacdd3bc722d7d5eda0dff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8ca0e42dd64bbe84c58b43411fa38a6dc55dff569c4abbc12194b550378021911e27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408232cb8203e880a0bebfd876ec202746bfefc84715b82a9f594e85d8176684578c26d980e97a0f7188e9def2175469b9cbf861f85f800182659694095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c44cd47f9661b5eb3d291053e0a2a2b1d63680a11abfd203a27cf7254a0e974fa01a548adb89e3a5ec1c812e810b127924c40de8e7ddd7c6a84b52e132481b69a0c0",
+                "rlp" : "0xf9025ef901f7a086c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a3b9e13b008727c13709eb12a2d07bdddcfd4a7fc9a37dbacdd3bc722d7d5eda0dff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8ca0e42dd64bbe84c58b43411fa38a6dc55dff569c4abbc12194b550378021911e27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408232cb8203e880a0c59075ee25318ac7a2e643e9fe1e3201223f15d61e1f55c819f5290994bc4d72883233066345b16218f861f85f800182659694095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c44cd47f9661b5eb3d291053e0a2a2b1d63680a11abfd203a27cf7254a0e974fa01a548adb89e3a5ec1c812e810b127924c40de8e7ddd7c6a84b52e132481b69a0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0922b9a9d20dd323e25ba37936527d2e5d98df97bb97635cbaf4f599840323170a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd1a2bb0be236f2883061ef66a15dd398ec64d6d2c624306dd7782d43820b1009",
-        "network" : "Homestead",
+        "lastblockhash" : "0x0a8d810a7376943dbd6290c9cec28227149b69c10d66780b818c29ed3a720e92",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -423,10 +437,10 @@
             }
         }
     },
-    "refund_NoOOG_1_d0g0v0_Metropolis" : {
+    "refund_NoOOG_1_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_NoOOG_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -438,18 +452,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x32cb",
-                    "hash" : "0xc5307920fadea74365f4d6425953d183db56c8fea55eac0f9c00ddd98063d604",
-                    "mixHash" : "0xa8aed14e03ffd8d755bd5cc3282171f514699da832f39a8e7b7b0f7cf73c9f79",
-                    "nonce" : "0xf29d3d7cfe7343fc",
+                    "hash" : "0xdb11f1e20674baa7c6efe8f789eb4251bc206f310f5cd503d199a4d1e3567c4a",
+                    "mixHash" : "0xb4633b0c42bad33390645f8f68d0b39a4e603796c44d31789adc89cb9f4624df",
+                    "nonce" : "0x01552cd7cd8b1547",
                     "number" : "0x01",
                     "parentHash" : "0x86c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489c",
-                    "receiptTrie" : "0xbf746beefa19da059d5810cb7b32cde1e5afa402222d0cbeea17736d3f724c70",
-                    "stateRoot" : "0xa7e86504ca0688e4f195b6640b3028cf6fb56739ccda34e94a90fae8300e871c",
+                    "receiptTrie" : "0xe42dd64bbe84c58b43411fa38a6dc55dff569c4abbc12194b550378021911e27",
+                    "stateRoot" : "0x8a3b9e13b008727c13709eb12a2d07bdddcfd4a7fc9a37dbacdd3bc722d7d5ed",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xdff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a086c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7e86504ca0688e4f195b6640b3028cf6fb56739ccda34e94a90fae8300e871ca0dff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8ca0bf746beefa19da059d5810cb7b32cde1e5afa402222d0cbeea17736d3f724c70b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408232cb8203e880a0a8aed14e03ffd8d755bd5cc3282171f514699da832f39a8e7b7b0f7cf73c9f7988f29d3d7cfe7343fcf861f85f800182659694095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c44cd47f9661b5eb3d291053e0a2a2b1d63680a11abfd203a27cf7254a0e974fa01a548adb89e3a5ec1c812e810b127924c40de8e7ddd7c6a84b52e132481b69a0c0",
+                "rlp" : "0xf9025ef901f7a086c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a3b9e13b008727c13709eb12a2d07bdddcfd4a7fc9a37dbacdd3bc722d7d5eda0dff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8ca0e42dd64bbe84c58b43411fa38a6dc55dff569c4abbc12194b550378021911e27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408232cb8203e880a0b4633b0c42bad33390645f8f68d0b39a4e603796c44d31789adc89cb9f4624df8801552cd7cd8b1547f861f85f800182659694095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c44cd47f9661b5eb3d291053e0a2a2b1d63680a11abfd203a27cf7254a0e974fa01a548adb89e3a5ec1c812e810b127924c40de8e7ddd7c6a84b52e132481b69a0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0922b9a9d20dd323e25ba37936527d2e5d98df97bb97635cbaf4f599840323170a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc5307920fadea74365f4d6425953d183db56c8fea55eac0f9c00ddd98063d604",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xdb11f1e20674baa7c6efe8f789eb4251bc206f310f5cd503d199a4d1e3567c4a",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f432cb",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x914d",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000600155",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xc418",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "refund_NoOOG_1_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_NoOOG_1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x32cb",
+                    "hash" : "0x0a8f61f5b54895476d00780b971fe82a5795698f0aa02dd3b98dd6364f453a3e",
+                    "mixHash" : "0x512d20569fccf2789946389309a64faacaedec42be4132f44fe090875d37e074",
+                    "nonce" : "0xe2e0c377dc3e6a2f",
+                    "number" : "0x01",
+                    "parentHash" : "0x86c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489c",
+                    "receiptTrie" : "0xe42dd64bbe84c58b43411fa38a6dc55dff569c4abbc12194b550378021911e27",
+                    "stateRoot" : "0x8a3b9e13b008727c13709eb12a2d07bdddcfd4a7fc9a37dbacdd3bc722d7d5ed",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xdff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8c",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a086c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a3b9e13b008727c13709eb12a2d07bdddcfd4a7fc9a37dbacdd3bc722d7d5eda0dff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8ca0e42dd64bbe84c58b43411fa38a6dc55dff569c4abbc12194b550378021911e27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408232cb8203e880a0512d20569fccf2789946389309a64faacaedec42be4132f44fe090875d37e07488e2e0c377dc3e6a2ff861f85f800182659694095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c44cd47f9661b5eb3d291053e0a2a2b1d63680a11abfd203a27cf7254a0e974fa01a548adb89e3a5ec1c812e810b127924c40de8e7ddd7c6a84b52e132481b69a0c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x6596",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xc44cd47f9661b5eb3d291053e0a2a2b1d63680a11abfd203a27cf7254a0e974f",
+                        "s" : "0x1a548adb89e3a5ec1c812e810b127924c40de8e7ddd7c6a84b52e132481b69a0",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x86c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x922b9a9d20dd323e25ba37936527d2e5d98df97bb97635cbaf4f599840323170",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0922b9a9d20dd323e25ba37936527d2e5d98df97bb97635cbaf4f599840323170a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0a8f61f5b54895476d00780b971fe82a5795698f0aa02dd3b98dd6364f453a3e",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600155",
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_OOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_OOG_d0g0v0.json
index e33db9b24..cd1d4bf02 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_OOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_OOG_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "refund_OOG_d0g0v0_EIP150" : {
+    "refund_OOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x6595",
-                    "hash" : "0xe940eb51b2499ab2a2cf92fb3e52d1c0808c37a3f9a50cdb721d28f3018cdab3",
-                    "mixHash" : "0xe1040720da62aa505df94c95e97daae997bd783b48f88c88d64d741c3767c810",
-                    "nonce" : "0x16e3d1690d50e17d",
+                    "hash" : "0xbc12b09e0f60a6aa811e37407f8b33d9c73e4dcdc93739b8db6c75e94a54cff8",
+                    "mixHash" : "0xe2d74bbd3832a5063d18fd594ae320c8382ca9cb044f0f39cde41d821d1412a9",
+                    "nonce" : "0x59d62a639cf1512c",
                     "number" : "0x01",
                     "parentHash" : "0x9760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1b",
-                    "receiptTrie" : "0xc4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1",
-                    "stateRoot" : "0x88312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2",
+                    "receiptTrie" : "0x2ccae62a76d2f9dafaaeabd1d1be41f894b18afa5b5ec55d302acc1688a2aaaa",
+                    "stateRoot" : "0xd655f4a9d4534b83b104a318c68cdedaa7522adfdce960a07818cb5b52b62703",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da0c4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a0e1040720da62aa505df94c95e97daae997bd783b48f88c88d64d741c3767c8108816e3d1690d50e17df861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
+                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d655f4a9d4534b83b104a318c68cdedaa7522adfdce960a07818cb5b52b62703a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da02ccae62a76d2f9dafaaeabd1d1be41f894b18afa5b5ec55d302acc1688a2aaaab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a0e2d74bbd3832a5063d18fd594ae320c8382ca9cb044f0f39cde41d821d1412a98859d62a639cf1512cf861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffe1435521fde24b7bdf5b873bbfdaf2db33a9df4f39e3a0021fdebdab0c1612a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe940eb51b2499ab2a2cf92fb3e52d1c0808c37a3f9a50cdb721d28f3018cdab3",
-        "network" : "EIP150",
+        "lastblockhash" : "0xbc12b09e0f60a6aa811e37407f8b33d9c73e4dcdc93739b8db6c75e94a54cff8",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600155",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "refund_OOG_d0g0v0_EIP158" : {
+    "refund_OOG_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/stRefundTest/refund_OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x6595",
-                    "hash" : "0x5a25e65b014ee0326dfa040ff72b1d6fb5823ad608a6d1fab4b18acbf1b694d5",
-                    "mixHash" : "0x8e4e2a31fcf7c8ee1a0ff4f539c18a0f95cc2925a4b1374b889f733d3715fd40",
-                    "nonce" : "0x22e1a9c795981998",
+                    "hash" : "0x0d113883aece06ea5dd107f6a62de9732263287ca800f1801fb811297f9f76d2",
+                    "mixHash" : "0x0461a1301b44cd530d1e321ecfda5c9ad51cfb796e1b9e028dc1d9bd536fb2b9",
+                    "nonce" : "0xf40fdaedd03c5781",
                     "number" : "0x01",
                     "parentHash" : "0x9760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1b",
-                    "receiptTrie" : "0xc4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1",
-                    "stateRoot" : "0x88312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2",
+                    "receiptTrie" : "0x2ccae62a76d2f9dafaaeabd1d1be41f894b18afa5b5ec55d302acc1688a2aaaa",
+                    "stateRoot" : "0xd655f4a9d4534b83b104a318c68cdedaa7522adfdce960a07818cb5b52b62703",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da0c4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a08e4e2a31fcf7c8ee1a0ff4f539c18a0f95cc2925a4b1374b889f733d3715fd408822e1a9c795981998f861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
+                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d655f4a9d4534b83b104a318c68cdedaa7522adfdce960a07818cb5b52b62703a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da02ccae62a76d2f9dafaaeabd1d1be41f894b18afa5b5ec55d302acc1688a2aaaab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a00461a1301b44cd530d1e321ecfda5c9ad51cfb796e1b9e028dc1d9bd536fb2b988f40fdaedd03c5781f861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffe1435521fde24b7bdf5b873bbfdaf2db33a9df4f39e3a0021fdebdab0c1612a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5a25e65b014ee0326dfa040ff72b1d6fb5823ad608a6d1fab4b18acbf1b694d5",
-        "network" : "EIP158",
+        "lastblockhash" : "0x0d113883aece06ea5dd107f6a62de9732263287ca800f1801fb811297f9f76d2",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600155",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "refund_OOG_d0g0v0_Frontier" : {
+    "refund_OOG_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x6595",
-                    "hash" : "0x55a240b2de976bc6314cddd542c4686cdaa62aefffd9b37c8813013f8d929723",
-                    "mixHash" : "0xe35b1508909c41c12bd72b03cee5ac397c75b67bba65d6af8b6b40ccc4b8e27a",
-                    "nonce" : "0x27193cbad83d03b7",
+                    "hash" : "0xbcd4e57f7688e619160d59fe27af7f3b7e0d619bfe77202a3b0d0e02988232a1",
+                    "mixHash" : "0x51630dcb22c15b43afd4b3fc279d2123b65ccc265f2e0820eeebc602f3c728ab",
+                    "nonce" : "0x2a4747fe2f111751",
                     "number" : "0x01",
                     "parentHash" : "0x9760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1b",
                     "receiptTrie" : "0xc4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0xe6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da0c4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a0e35b1508909c41c12bd72b03cee5ac397c75b67bba65d6af8b6b40ccc4b8e27a8827193cbad83d03b7f861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
+                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da0c4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a051630dcb22c15b43afd4b3fc279d2123b65ccc265f2e0820eeebc602f3c728ab882a4747fe2f111751f861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffe1435521fde24b7bdf5b873bbfdaf2db33a9df4f39e3a0021fdebdab0c1612a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x55a240b2de976bc6314cddd542c4686cdaa62aefffd9b37c8813013f8d929723",
-        "network" : "Frontier",
+        "lastblockhash" : "0xbcd4e57f7688e619160d59fe27af7f3b7e0d619bfe77202a3b0d0e02988232a1",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "refund_OOG_d0g0v0_Homestead" : {
+    "refund_OOG_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x6595",
-                    "hash" : "0x6c231e966b139e8f741fcdc9670b5fbe9d1a376407976d6cedba5b2812510e49",
-                    "mixHash" : "0x666cb627420e540de364dc4fd191a9a3806509c5867e9d73301a4cb4a6dc54aa",
-                    "nonce" : "0x59953cc5038bb671",
+                    "hash" : "0xace4cf4565fc085f96a8b25c9e65d8a143bb49debb98939d319fc77e2d898d8c",
+                    "mixHash" : "0x6ca4f9e5f2a0c29e8517483ddae0fba2ab143a2369e4a5a8640c32c254b16a57",
+                    "nonce" : "0x6418df4a20178008",
                     "number" : "0x01",
                     "parentHash" : "0x9760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1b",
                     "receiptTrie" : "0xc4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0xe6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da0c4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a0666cb627420e540de364dc4fd191a9a3806509c5867e9d73301a4cb4a6dc54aa8859953cc5038bb671f861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
+                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da0c4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a06ca4f9e5f2a0c29e8517483ddae0fba2ab143a2369e4a5a8640c32c254b16a57886418df4a20178008f861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffe1435521fde24b7bdf5b873bbfdaf2db33a9df4f39e3a0021fdebdab0c1612a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6c231e966b139e8f741fcdc9670b5fbe9d1a376407976d6cedba5b2812510e49",
-        "network" : "Homestead",
+        "lastblockhash" : "0xace4cf4565fc085f96a8b25c9e65d8a143bb49debb98939d319fc77e2d898d8c",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "refund_OOG_d0g0v0_Metropolis" : {
+    "refund_OOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x6595",
-                    "hash" : "0xc64a4e7fd829cab2c121919a116058215750cc6e940d0990957729e2168ca776",
-                    "mixHash" : "0x6b90576ba23906347416f9482f7c525acd4222c338f0da9ee0e83706fb9f343b",
-                    "nonce" : "0x111805d3bbe96769",
+                    "hash" : "0xdc77a4d1952a6111da11af15d2c751a7912ee54c23380f3d7d4604aba353bf85",
+                    "mixHash" : "0x7f68dffd4eba2964a1b1d9e009996f23d1ede66d1addc9c7b17ffbdcd9e779b3",
+                    "nonce" : "0x6807b005d0d2f29d",
                     "number" : "0x01",
                     "parentHash" : "0x9760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1b",
-                    "receiptTrie" : "0x2ccae62a76d2f9dafaaeabd1d1be41f894b18afa5b5ec55d302acc1688a2aaaa",
-                    "stateRoot" : "0xd655f4a9d4534b83b104a318c68cdedaa7522adfdce960a07818cb5b52b62703",
+                    "receiptTrie" : "0xc4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1",
+                    "stateRoot" : "0x88312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d655f4a9d4534b83b104a318c68cdedaa7522adfdce960a07818cb5b52b62703a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da02ccae62a76d2f9dafaaeabd1d1be41f894b18afa5b5ec55d302acc1688a2aaaab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a06b90576ba23906347416f9482f7c525acd4222c338f0da9ee0e83706fb9f343b88111805d3bbe96769f861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
+                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da0c4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a07f68dffd4eba2964a1b1d9e009996f23d1ede66d1addc9c7b17ffbdcd9e779b3886807b005d0d2f29df861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffe1435521fde24b7bdf5b873bbfdaf2db33a9df4f39e3a0021fdebdab0c1612a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc64a4e7fd829cab2c121919a116058215750cc6e940d0990957729e2168ca776",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xdc77a4d1952a6111da11af15d2c751a7912ee54c23380f3d7d4604aba353bf85",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f46595",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x073b8b",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x07a120",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "refund_OOG_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_OOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x6595",
+                    "hash" : "0x3684310742858fdb2f161afa2340e351cf6c118e86e014262accc21e79319031",
+                    "mixHash" : "0x80b0518a4470708f4f4e33abcc981d80bccc7ac0e88830a7180adce0d32e4fa4",
+                    "nonce" : "0xbed4ee7c8df37b73",
+                    "number" : "0x01",
+                    "parentHash" : "0x9760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1b",
+                    "receiptTrie" : "0xc4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1",
+                    "stateRoot" : "0x88312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xe6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da0c4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a080b0518a4470708f4f4e33abcc981d80bccc7ac0e88830a7180adce0d32e4fa488bed4ee7c8df37b73f861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x6595",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82d",
+                        "s" : "0x16dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x9760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xffe1435521fde24b7bdf5b873bbfdaf2db33a9df4f39e3a0021fdebdab0c1612",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffe1435521fde24b7bdf5b873bbfdaf2db33a9df4f39e3a0021fdebdab0c1612a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3684310742858fdb2f161afa2340e351cf6c118e86e014262accc21e79319031",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600155",
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_TxToSuicideOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_TxToSuicideOOG_d0g0v0.json
index 44643d238..6aa39e9cc 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_TxToSuicideOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_TxToSuicideOOG_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "refund_TxToSuicideOOG_d0g0v0_EIP150" : {
+    "refund_TxToSuicideOOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicideOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x520a",
-                    "hash" : "0x82623e401c253d82e3655f6f61aa064fb3e498653d2b04664548ab91fcf88fef",
-                    "mixHash" : "0x2bad16798dd321c12743781d09c311be782e4255461f3e81e93e8049d8841545",
-                    "nonce" : "0x5f634134ce48ed5e",
+                    "hash" : "0x33bd5a59d85238228d088d7e73153e5e0bd140fb2bf1b563c204b0653ec9a409",
+                    "mixHash" : "0x065af08ae779846dfe39c4c80518b64a4fcf69e3710510a79d449374cf6bfd7c",
+                    "nonce" : "0x664e201ab4b4c0af",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
-                    "receiptTrie" : "0xc71a9383ba1469c8a2321240f0545ea619c63421a4e172d9e84cebed53d02ad8",
-                    "stateRoot" : "0x594f337d177670cf497c9868e65681f934faa6b8a165cc779829dfd77cc60b07",
+                    "receiptTrie" : "0x2f80f76d88921985d5457a0dde2cf5102df4037660f8902f3fa43762ea476d71",
+                    "stateRoot" : "0xa81a0eba8d9191115c774db2c83435fc5d01b5405bfd77adcf1b309684dce3f2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ad",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0594f337d177670cf497c9868e65681f934faa6b8a165cc779829dfd77cc60b07a07210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ada0c71a9383ba1469c8a2321240f0545ea619c63421a4e172d9e84cebed53d02ad8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520a8203e880a02bad16798dd321c12743781d09c311be782e4255461f3e81e93e8049d8841545885f634134ce48ed5ef861f85f800182520a94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca09c647c65c10f9a3f2e16878a25405b22f2fef2ec96b18d68f68d34d551b93de4a023267f7401ef09f9615de4bbb3943cb2be892bc889efff06f16fddf59ac3ac91c0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a81a0eba8d9191115c774db2c83435fc5d01b5405bfd77adcf1b309684dce3f2a07210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ada02f80f76d88921985d5457a0dde2cf5102df4037660f8902f3fa43762ea476d71b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520a8203e880a0065af08ae779846dfe39c4c80518b64a4fcf69e3710510a79d449374cf6bfd7c88664e201ab4b4c0aff861f85f800182520a94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca09c647c65c10f9a3f2e16878a25405b22f2fef2ec96b18d68f68d34d551b93de4a023267f7401ef09f9615de4bbb3943cb2be892bc889efff06f16fddf59ac3ac91c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x82623e401c253d82e3655f6f61aa064fb3e498653d2b04664548ab91fcf88fef",
-        "network" : "EIP150",
+        "lastblockhash" : "0x33bd5a59d85238228d088d7e73153e5e0bd140fb2bf1b563c204b0653ec9a409",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4520a",
                 "code" : "",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "refund_TxToSuicideOOG_d0g0v0_EIP158" : {
+    "refund_TxToSuicideOOG_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/stRefundTest/refund_TxToSuicideOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x520a",
-                    "hash" : "0x678027539e5c03e611cc7190b920be6f31fb039a11ba3741ee64987456fd2bba",
-                    "mixHash" : "0x8ed08722fdc2654be32d7f50edb307c13d26829025997c4960e0fba97797a1e8",
-                    "nonce" : "0xc627a6ba87127378",
+                    "hash" : "0xe111f4432795d3b214491d3e0767fb06c72245406cad3ac1b03e11492d3b5881",
+                    "mixHash" : "0xbda974e72affef3a19dd6ccdf1f8d1119985cf99e2fd243ac130a2bacdbece6a",
+                    "nonce" : "0xc25563bfa8def9dd",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
-                    "receiptTrie" : "0xc71a9383ba1469c8a2321240f0545ea619c63421a4e172d9e84cebed53d02ad8",
-                    "stateRoot" : "0x594f337d177670cf497c9868e65681f934faa6b8a165cc779829dfd77cc60b07",
+                    "receiptTrie" : "0x2f80f76d88921985d5457a0dde2cf5102df4037660f8902f3fa43762ea476d71",
+                    "stateRoot" : "0xa81a0eba8d9191115c774db2c83435fc5d01b5405bfd77adcf1b309684dce3f2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ad",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0594f337d177670cf497c9868e65681f934faa6b8a165cc779829dfd77cc60b07a07210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ada0c71a9383ba1469c8a2321240f0545ea619c63421a4e172d9e84cebed53d02ad8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520a8203e880a08ed08722fdc2654be32d7f50edb307c13d26829025997c4960e0fba97797a1e888c627a6ba87127378f861f85f800182520a94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca09c647c65c10f9a3f2e16878a25405b22f2fef2ec96b18d68f68d34d551b93de4a023267f7401ef09f9615de4bbb3943cb2be892bc889efff06f16fddf59ac3ac91c0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a81a0eba8d9191115c774db2c83435fc5d01b5405bfd77adcf1b309684dce3f2a07210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ada02f80f76d88921985d5457a0dde2cf5102df4037660f8902f3fa43762ea476d71b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520a8203e880a0bda974e72affef3a19dd6ccdf1f8d1119985cf99e2fd243ac130a2bacdbece6a88c25563bfa8def9ddf861f85f800182520a94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca09c647c65c10f9a3f2e16878a25405b22f2fef2ec96b18d68f68d34d551b93de4a023267f7401ef09f9615de4bbb3943cb2be892bc889efff06f16fddf59ac3ac91c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x678027539e5c03e611cc7190b920be6f31fb039a11ba3741ee64987456fd2bba",
-        "network" : "EIP158",
+        "lastblockhash" : "0xe111f4432795d3b214491d3e0767fb06c72245406cad3ac1b03e11492d3b5881",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4520a",
                 "code" : "",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "refund_TxToSuicideOOG_d0g0v0_Frontier" : {
+    "refund_TxToSuicideOOG_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicideOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x520a",
-                    "hash" : "0x597ce845319facda9f595cf7ab0806120dcc829ee2d5a16d9ce66b5bfacf5231",
-                    "mixHash" : "0xd7b3701d1299de51ff057766b72ac0824d10247222e4b04244aaf881983882fb",
-                    "nonce" : "0xe18abe951c66ffcd",
+                    "hash" : "0x2aa3ba7140fa643b8bbdc8ec6ac892212d9a5a3b682828e24b094d9aececeb29",
+                    "mixHash" : "0x08b5f27ce690ac0ef107367f16650a9ec973c84d85c165f23d74282bcd32aaa2",
+                    "nonce" : "0xa4dccb3d73c4b69a",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
                     "receiptTrie" : "0xc71a9383ba1469c8a2321240f0545ea619c63421a4e172d9e84cebed53d02ad8",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0x7210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ad",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0594f337d177670cf497c9868e65681f934faa6b8a165cc779829dfd77cc60b07a07210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ada0c71a9383ba1469c8a2321240f0545ea619c63421a4e172d9e84cebed53d02ad8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520a8203e880a0d7b3701d1299de51ff057766b72ac0824d10247222e4b04244aaf881983882fb88e18abe951c66ffcdf861f85f800182520a94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca09c647c65c10f9a3f2e16878a25405b22f2fef2ec96b18d68f68d34d551b93de4a023267f7401ef09f9615de4bbb3943cb2be892bc889efff06f16fddf59ac3ac91c0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0594f337d177670cf497c9868e65681f934faa6b8a165cc779829dfd77cc60b07a07210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ada0c71a9383ba1469c8a2321240f0545ea619c63421a4e172d9e84cebed53d02ad8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520a8203e880a008b5f27ce690ac0ef107367f16650a9ec973c84d85c165f23d74282bcd32aaa288a4dccb3d73c4b69af861f85f800182520a94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca09c647c65c10f9a3f2e16878a25405b22f2fef2ec96b18d68f68d34d551b93de4a023267f7401ef09f9615de4bbb3943cb2be892bc889efff06f16fddf59ac3ac91c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x597ce845319facda9f595cf7ab0806120dcc829ee2d5a16d9ce66b5bfacf5231",
-        "network" : "Frontier",
+        "lastblockhash" : "0x2aa3ba7140fa643b8bbdc8ec6ac892212d9a5a3b682828e24b094d9aececeb29",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4520a",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "refund_TxToSuicideOOG_d0g0v0_Homestead" : {
+    "refund_TxToSuicideOOG_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicideOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x520a",
-                    "hash" : "0xf5f6f21154602f6cc2b7ca201c486ab8f2a650855dd4428a5832838894b5fd26",
-                    "mixHash" : "0x99c7ac350dae9f655ed1764b060e374ea881a9e133b826dcff55731a19485d33",
-                    "nonce" : "0xcca4fd6bcb9143de",
+                    "hash" : "0xef59e39f9b4a88935cc9185c0438e18f03edae91957b7567456b5ff99dc29193",
+                    "mixHash" : "0xd3e47e147b4a32e0910a0ac1e5d5da72122cd0e5775258aa188c70c114b9a52b",
+                    "nonce" : "0x50af2e53b16cbdf4",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
                     "receiptTrie" : "0xc71a9383ba1469c8a2321240f0545ea619c63421a4e172d9e84cebed53d02ad8",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0x7210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ad",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0594f337d177670cf497c9868e65681f934faa6b8a165cc779829dfd77cc60b07a07210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ada0c71a9383ba1469c8a2321240f0545ea619c63421a4e172d9e84cebed53d02ad8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520a8203e880a099c7ac350dae9f655ed1764b060e374ea881a9e133b826dcff55731a19485d3388cca4fd6bcb9143def861f85f800182520a94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca09c647c65c10f9a3f2e16878a25405b22f2fef2ec96b18d68f68d34d551b93de4a023267f7401ef09f9615de4bbb3943cb2be892bc889efff06f16fddf59ac3ac91c0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0594f337d177670cf497c9868e65681f934faa6b8a165cc779829dfd77cc60b07a07210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ada0c71a9383ba1469c8a2321240f0545ea619c63421a4e172d9e84cebed53d02ad8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520a8203e880a0d3e47e147b4a32e0910a0ac1e5d5da72122cd0e5775258aa188c70c114b9a52b8850af2e53b16cbdf4f861f85f800182520a94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca09c647c65c10f9a3f2e16878a25405b22f2fef2ec96b18d68f68d34d551b93de4a023267f7401ef09f9615de4bbb3943cb2be892bc889efff06f16fddf59ac3ac91c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf5f6f21154602f6cc2b7ca201c486ab8f2a650855dd4428a5832838894b5fd26",
-        "network" : "Homestead",
+        "lastblockhash" : "0xef59e39f9b4a88935cc9185c0438e18f03edae91957b7567456b5ff99dc29193",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4520a",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "refund_TxToSuicideOOG_d0g0v0_Metropolis" : {
+    "refund_TxToSuicideOOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicideOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x520a",
-                    "hash" : "0x0e1b58c46520045a37e695330d4b5782b2bae197f83a63445383c06467c8939c",
-                    "mixHash" : "0xcf455f8dfbb6c570dc0faf66917171a411d7a0ff98870bda1e9faa68098dee39",
-                    "nonce" : "0xd5ca89cf1a27fc5b",
+                    "hash" : "0xe7779dfd58c35d37ac88b553a44b103257ea121f4fc964fb9426b846edf8aa02",
+                    "mixHash" : "0x8ce2bd1e651c20a94a6ef061a88b83a010d674ecc3a4f06aee8b6592f2b961f1",
+                    "nonce" : "0x909d04e252cf2656",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
-                    "receiptTrie" : "0x2f80f76d88921985d5457a0dde2cf5102df4037660f8902f3fa43762ea476d71",
-                    "stateRoot" : "0xa81a0eba8d9191115c774db2c83435fc5d01b5405bfd77adcf1b309684dce3f2",
+                    "receiptTrie" : "0xc71a9383ba1469c8a2321240f0545ea619c63421a4e172d9e84cebed53d02ad8",
+                    "stateRoot" : "0x594f337d177670cf497c9868e65681f934faa6b8a165cc779829dfd77cc60b07",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ad",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a81a0eba8d9191115c774db2c83435fc5d01b5405bfd77adcf1b309684dce3f2a07210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ada02f80f76d88921985d5457a0dde2cf5102df4037660f8902f3fa43762ea476d71b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520a8203e880a0cf455f8dfbb6c570dc0faf66917171a411d7a0ff98870bda1e9faa68098dee3988d5ca89cf1a27fc5bf861f85f800182520a94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca09c647c65c10f9a3f2e16878a25405b22f2fef2ec96b18d68f68d34d551b93de4a023267f7401ef09f9615de4bbb3943cb2be892bc889efff06f16fddf59ac3ac91c0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0594f337d177670cf497c9868e65681f934faa6b8a165cc779829dfd77cc60b07a07210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ada0c71a9383ba1469c8a2321240f0545ea619c63421a4e172d9e84cebed53d02ad8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520a8203e880a08ce2bd1e651c20a94a6ef061a88b83a010d674ecc3a4f06aee8b6592f2b961f188909d04e252cf2656f861f85f800182520a94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca09c647c65c10f9a3f2e16878a25405b22f2fef2ec96b18d68f68d34d551b93de4a023267f7401ef09f9615de4bbb3943cb2be892bc889efff06f16fddf59ac3ac91c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0e1b58c46520045a37e695330d4b5782b2bae197f83a63445383c06467c8939c",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xe7779dfd58c35d37ac88b553a44b103257ea121f4fc964fb9426b846edf8aa02",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4520a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f58ef6",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f5e100",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        }
+    },
+    "refund_TxToSuicideOOG_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicideOOG_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x520a",
+                    "hash" : "0x9dff1ca01cc198b20dca227ab0dc9b69376809012b93905e8454f46e3a1a2431",
+                    "mixHash" : "0xdf9b5c00f47acb06a472fcc3f94542c1d1082e7719dae3806409a1a078de8725",
+                    "nonce" : "0xa21183707e5d1cce",
+                    "number" : "0x01",
+                    "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
+                    "receiptTrie" : "0xc71a9383ba1469c8a2321240f0545ea619c63421a4e172d9e84cebed53d02ad8",
+                    "stateRoot" : "0x594f337d177670cf497c9868e65681f934faa6b8a165cc779829dfd77cc60b07",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x7210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ad",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0594f337d177670cf497c9868e65681f934faa6b8a165cc779829dfd77cc60b07a07210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ada0c71a9383ba1469c8a2321240f0545ea619c63421a4e172d9e84cebed53d02ad8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520a8203e880a0df9b5c00f47acb06a472fcc3f94542c1d1082e7719dae3806409a1a078de872588a21183707e5d1ccef861f85f800182520a94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca09c647c65c10f9a3f2e16878a25405b22f2fef2ec96b18d68f68d34d551b93de4a023267f7401ef09f9615de4bbb3943cb2be892bc889efff06f16fddf59ac3ac91c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x520a",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x9c647c65c10f9a3f2e16878a25405b22f2fef2ec96b18d68f68d34d551b93de4",
+                        "s" : "0x23267f7401ef09f9615de4bbb3943cb2be892bc889efff06f16fddf59ac3ac91",
+                        "to" : "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x39057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x9dff1ca01cc198b20dca227ab0dc9b69376809012b93905e8454f46e3a1a2431",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4520a",
                 "code" : "",
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_TxToSuicide_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_TxToSuicide_d0g0v0.json
index ecf500ede..12bb800a3 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_TxToSuicide_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_TxToSuicide_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "refund_TxToSuicide_d0g0v0_EIP150" : {
+    "refund_TxToSuicide_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x520b",
-                    "hash" : "0x876bf1542003eb057b6ca34c7e23f0df603d24e038808342e129aab0f0439eb5",
-                    "mixHash" : "0x394fb8352ad122a6af91dec8f75b5ce4847400b2daafc639245df9630586908d",
-                    "nonce" : "0x8911058ef462c362",
+                    "hash" : "0x471a01d48fbec845c1e52c8fe599edf8a2209ac72a3a934d3416e7c2470ad86e",
+                    "mixHash" : "0xe9344117cb89e06b4ab75132ae38206d2c34462b0c6ee469523d8e55b18a78f0",
+                    "nonce" : "0xb00c82991b92f7a6",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
-                    "receiptTrie" : "0x5e18d0570df18249230e15bd83dcc239f64621b742fd74860557fe87407378a4",
-                    "stateRoot" : "0x715c5bebc59ddc652a16bde8d7a8e8c08278fda903637ef1b8f0d6a0aad8e751",
+                    "receiptTrie" : "0x4053cc5113c9796c3227d96da76ad74cec79e4d5110003e92638ddb3772355e5",
+                    "stateRoot" : "0x928f8ffc8d6f3441f311dd19504033ad5d7bd612257b3f3ad6436c5a7bc879b7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0715c5bebc59ddc652a16bde8d7a8e8c08278fda903637ef1b8f0d6a0aad8e751a0665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489a05e18d0570df18249230e15bd83dcc239f64621b742fd74860557fe87407378a4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520b8203e880a0394fb8352ad122a6af91dec8f75b5ce4847400b2daafc639245df9630586908d888911058ef462c362f861f85f800182520b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca0b736349ed314af23244e16cb7e723d2e19483d98f1e913116e1288efd821e39ca03d84cb7e6409a0baeeeded8cd4f6b234bc9afc71433dbac75f72badd2b0c11adc0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0928f8ffc8d6f3441f311dd19504033ad5d7bd612257b3f3ad6436c5a7bc879b7a0665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489a04053cc5113c9796c3227d96da76ad74cec79e4d5110003e92638ddb3772355e5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520b8203e880a0e9344117cb89e06b4ab75132ae38206d2c34462b0c6ee469523d8e55b18a78f088b00c82991b92f7a6f861f85f800182520b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca0b736349ed314af23244e16cb7e723d2e19483d98f1e913116e1288efd821e39ca03d84cb7e6409a0baeeeded8cd4f6b234bc9afc71433dbac75f72badd2b0c11adc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x876bf1542003eb057b6ca34c7e23f0df603d24e038808342e129aab0f0439eb5",
-        "network" : "EIP150",
+        "lastblockhash" : "0x471a01d48fbec845c1e52c8fe599edf8a2209ac72a3a934d3416e7c2470ad86e",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4520b",
                 "code" : "",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "refund_TxToSuicide_d0g0v0_EIP158" : {
+    "refund_TxToSuicide_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/stRefundTest/refund_TxToSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x520b",
-                    "hash" : "0x3a91bd32b9c2b2fb74c68c2c3fea73a3f56d1d9c62a6601a146b10ec4d1780c9",
-                    "mixHash" : "0x18d9d3c3ba30989748cfe59c1583e8dcd6bbfa108cc91e663ff7a92d9b669ffa",
-                    "nonce" : "0x8e217f3fd10d3a3f",
+                    "hash" : "0x61643c0042b750144cf237a8b94dd8d529a06f9be575e073aff3e0deabf223dd",
+                    "mixHash" : "0x76e3f6cdbd9b3019b794cf35de60e7ae82d25593acd3046d76c5623a560b7e90",
+                    "nonce" : "0x22a887a588a65a88",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
-                    "receiptTrie" : "0x5e18d0570df18249230e15bd83dcc239f64621b742fd74860557fe87407378a4",
-                    "stateRoot" : "0x715c5bebc59ddc652a16bde8d7a8e8c08278fda903637ef1b8f0d6a0aad8e751",
+                    "receiptTrie" : "0x4053cc5113c9796c3227d96da76ad74cec79e4d5110003e92638ddb3772355e5",
+                    "stateRoot" : "0x928f8ffc8d6f3441f311dd19504033ad5d7bd612257b3f3ad6436c5a7bc879b7",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0715c5bebc59ddc652a16bde8d7a8e8c08278fda903637ef1b8f0d6a0aad8e751a0665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489a05e18d0570df18249230e15bd83dcc239f64621b742fd74860557fe87407378a4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520b8203e880a018d9d3c3ba30989748cfe59c1583e8dcd6bbfa108cc91e663ff7a92d9b669ffa888e217f3fd10d3a3ff861f85f800182520b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca0b736349ed314af23244e16cb7e723d2e19483d98f1e913116e1288efd821e39ca03d84cb7e6409a0baeeeded8cd4f6b234bc9afc71433dbac75f72badd2b0c11adc0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0928f8ffc8d6f3441f311dd19504033ad5d7bd612257b3f3ad6436c5a7bc879b7a0665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489a04053cc5113c9796c3227d96da76ad74cec79e4d5110003e92638ddb3772355e5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520b8203e880a076e3f6cdbd9b3019b794cf35de60e7ae82d25593acd3046d76c5623a560b7e908822a887a588a65a88f861f85f800182520b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca0b736349ed314af23244e16cb7e723d2e19483d98f1e913116e1288efd821e39ca03d84cb7e6409a0baeeeded8cd4f6b234bc9afc71433dbac75f72badd2b0c11adc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3a91bd32b9c2b2fb74c68c2c3fea73a3f56d1d9c62a6601a146b10ec4d1780c9",
-        "network" : "EIP158",
+        "lastblockhash" : "0x61643c0042b750144cf237a8b94dd8d529a06f9be575e073aff3e0deabf223dd",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4520b",
                 "code" : "",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "refund_TxToSuicide_d0g0v0_Frontier" : {
+    "refund_TxToSuicide_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -227,19 +241,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x2906",
-                    "hash" : "0x323a26743c65b9615a3899d32c5f9762204c4702912f1e6645a3d0183c93cb24",
-                    "mixHash" : "0x467171a36c7f97a30e9cc8b45b9afa467b3a4a9b87ba77171d30eea757d6dc27",
-                    "nonce" : "0xfa329bfc9fcc9db0",
+                    "gasUsed" : "0x520b",
+                    "hash" : "0xfd78c915d8f99ca0b0904901ef933b10c063081bc60684ff3624027429d84bad",
+                    "mixHash" : "0xe29e558be17234e9b6c32b4a508c25966d2661930ff1ff18addf2236eb277184",
+                    "nonce" : "0xdb4eb27174b0980e",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
-                    "receiptTrie" : "0xd4b15c293435a5d48086c5f74c34acb137fdd345d11d1210adaa4f280e1860f4",
-                    "stateRoot" : "0x6a48a28ef51d1648c351cc529b9da76a9c8d740c7973d169d24c24c199cbb83e",
+                    "receiptTrie" : "0x5e18d0570df18249230e15bd83dcc239f64621b742fd74860557fe87407378a4",
+                    "stateRoot" : "0x715c5bebc59ddc652a16bde8d7a8e8c08278fda903637ef1b8f0d6a0aad8e751",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a48a28ef51d1648c351cc529b9da76a9c8d740c7973d169d24c24c199cbb83ea0665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489a0d4b15c293435a5d48086c5f74c34acb137fdd345d11d1210adaa4f280e1860f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a0467171a36c7f97a30e9cc8b45b9afa467b3a4a9b87ba77171d30eea757d6dc2788fa329bfc9fcc9db0f861f85f800182520b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca0b736349ed314af23244e16cb7e723d2e19483d98f1e913116e1288efd821e39ca03d84cb7e6409a0baeeeded8cd4f6b234bc9afc71433dbac75f72badd2b0c11adc0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0715c5bebc59ddc652a16bde8d7a8e8c08278fda903637ef1b8f0d6a0aad8e751a0665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489a05e18d0570df18249230e15bd83dcc239f64621b742fd74860557fe87407378a4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520b8203e880a0e29e558be17234e9b6c32b4a508c25966d2661930ff1ff18addf2236eb27718488db4eb27174b0980ef861f85f800182520b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca0b736349ed314af23244e16cb7e723d2e19483d98f1e913116e1288efd821e39ca03d84cb7e6409a0baeeeded8cd4f6b234bc9afc71433dbac75f72badd2b0c11adc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,29 +290,137 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x323a26743c65b9615a3899d32c5f9762204c4702912f1e6645a3d0183c93cb24",
-        "network" : "Frontier",
+        "lastblockhash" : "0xfd78c915d8f99ca0b0904901ef933b10c063081bc60684ff3624027429d84bad",
+        "network" : "EIP150",
         "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a764000a",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4520b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f58ef5",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f5e100",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        }
+    },
+    "refund_TxToSuicide_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicide_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x520b",
+                    "hash" : "0xffc844899c88b8df0fb84a0afb2f1754ef03fd11e29868b22b6dd809cc5e1868",
+                    "mixHash" : "0x8a33fdb43640249f445adc95c24769ae4ac64cf3b4aa86ff197c2413bcb8221f",
+                    "nonce" : "0x5d3596b9f8709a20",
+                    "number" : "0x01",
+                    "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
+                    "receiptTrie" : "0x5e18d0570df18249230e15bd83dcc239f64621b742fd74860557fe87407378a4",
+                    "stateRoot" : "0x715c5bebc59ddc652a16bde8d7a8e8c08278fda903637ef1b8f0d6a0aad8e751",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0715c5bebc59ddc652a16bde8d7a8e8c08278fda903637ef1b8f0d6a0aad8e751a0665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489a05e18d0570df18249230e15bd83dcc239f64621b742fd74860557fe87407378a4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520b8203e880a08a33fdb43640249f445adc95c24769ae4ac64cf3b4aa86ff197c2413bcb8221f885d3596b9f8709a20f861f85f800182520b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca0b736349ed314af23244e16cb7e723d2e19483d98f1e913116e1288efd821e39ca03d84cb7e6409a0baeeeded8cd4f6b234bc9afc71433dbac75f72badd2b0c11adc0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x520b",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xb736349ed314af23244e16cb7e723d2e19483d98f1e913116e1288efd821e39c",
+                        "s" : "0x3d84cb7e6409a0baeeeded8cd4f6b234bc9afc71433dbac75f72badd2b0c11ad",
+                        "to" : "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x39057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xffc844899c88b8df0fb84a0afb2f1754ef03fd11e29868b22b6dd809cc5e1868",
+        "network" : "EIP158",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f42906",
+                "balance" : "0x4563918244f4520b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x05f5b7f0",
+                "balance" : "0x05f58ef5",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
             }
         },
         "pre" : {
@@ -319,10 +441,10 @@
             }
         }
     },
-    "refund_TxToSuicide_d0g0v0_Homestead" : {
+    "refund_TxToSuicide_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -334,9 +456,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x2906",
-                    "hash" : "0x2fdf823da65c451d203be23eafea7b72f160d7a787b3f0a4d8156be438a38be2",
-                    "mixHash" : "0xb245c98a81279a192e72bf213c257ffda4f5bca945ad7c2d539dc419824bf741",
-                    "nonce" : "0xa4997aa44ea2a3c8",
+                    "hash" : "0x7ffc3f5802df489cf9392ea20a48f5a5cae03b0f425fca5cd4d88bf5ed555213",
+                    "mixHash" : "0xc597556bebb0614aba2c4a095e270190a6a140a1c7082a6829b903c5fa57e6ab",
+                    "nonce" : "0x21581f3c8f2643cc",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
                     "receiptTrie" : "0xd4b15c293435a5d48086c5f74c34acb137fdd345d11d1210adaa4f280e1860f4",
@@ -345,7 +467,7 @@
                     "transactionsTrie" : "0x665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a48a28ef51d1648c351cc529b9da76a9c8d740c7973d169d24c24c199cbb83ea0665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489a0d4b15c293435a5d48086c5f74c34acb137fdd345d11d1210adaa4f280e1860f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a0b245c98a81279a192e72bf213c257ffda4f5bca945ad7c2d539dc419824bf74188a4997aa44ea2a3c8f861f85f800182520b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca0b736349ed314af23244e16cb7e723d2e19483d98f1e913116e1288efd821e39ca03d84cb7e6409a0baeeeded8cd4f6b234bc9afc71433dbac75f72badd2b0c11adc0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a48a28ef51d1648c351cc529b9da76a9c8d740c7973d169d24c24c199cbb83ea0665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489a0d4b15c293435a5d48086c5f74c34acb137fdd345d11d1210adaa4f280e1860f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a0c597556bebb0614aba2c4a095e270190a6a140a1c7082a6829b903c5fa57e6ab8821581f3c8f2643ccf861f85f800182520b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca0b736349ed314af23244e16cb7e723d2e19483d98f1e913116e1288efd821e39ca03d84cb7e6409a0baeeeded8cd4f6b234bc9afc71433dbac75f72badd2b0c11adc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -382,8 +504,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2fdf823da65c451d203be23eafea7b72f160d7a787b3f0a4d8156be438a38be2",
-        "network" : "Homestead",
+        "lastblockhash" : "0x7ffc3f5802df489cf9392ea20a48f5a5cae03b0f425fca5cd4d88bf5ed555213",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -425,10 +547,10 @@
             }
         }
     },
-    "refund_TxToSuicide_d0g0v0_Metropolis" : {
+    "refund_TxToSuicide_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/stRefundTest/refund_TxToSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -439,19 +561,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x520b",
-                    "hash" : "0x9c8112f98c02144a8a9868f904d1f4f2b8d4f9896597c6c9d5869ab143a4b993",
-                    "mixHash" : "0xb3db02a179f97d1ae459671c534c8288d25f498b0a3fbda184ecf24afdad1119",
-                    "nonce" : "0x9827e8bf912f319c",
+                    "gasUsed" : "0x2906",
+                    "hash" : "0xf0784b8b1f9707ff96ef9f687853fd3d5d41289aee05f7755664fd9ae7a97ae7",
+                    "mixHash" : "0xf03133235793eb6a20ee67594a47d5da2d3221252655fe5499569348cb693d25",
+                    "nonce" : "0xde12484100e6a0ac",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
-                    "receiptTrie" : "0x4053cc5113c9796c3227d96da76ad74cec79e4d5110003e92638ddb3772355e5",
-                    "stateRoot" : "0x928f8ffc8d6f3441f311dd19504033ad5d7bd612257b3f3ad6436c5a7bc879b7",
+                    "receiptTrie" : "0xd4b15c293435a5d48086c5f74c34acb137fdd345d11d1210adaa4f280e1860f4",
+                    "stateRoot" : "0x6a48a28ef51d1648c351cc529b9da76a9c8d740c7973d169d24c24c199cbb83e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0928f8ffc8d6f3441f311dd19504033ad5d7bd612257b3f3ad6436c5a7bc879b7a0665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489a04053cc5113c9796c3227d96da76ad74cec79e4d5110003e92638ddb3772355e5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520b8203e880a0b3db02a179f97d1ae459671c534c8288d25f498b0a3fbda184ecf24afdad1119889827e8bf912f319cf861f85f800182520b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca0b736349ed314af23244e16cb7e723d2e19483d98f1e913116e1288efd821e39ca03d84cb7e6409a0baeeeded8cd4f6b234bc9afc71433dbac75f72badd2b0c11adc0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a48a28ef51d1648c351cc529b9da76a9c8d740c7973d169d24c24c199cbb83ea0665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489a0d4b15c293435a5d48086c5f74c34acb137fdd345d11d1210adaa4f280e1860f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a0f03133235793eb6a20ee67594a47d5da2d3221252655fe5499569348cb693d2588de12484100e6a0acf861f85f800182520b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca0b736349ed314af23244e16cb7e723d2e19483d98f1e913116e1288efd821e39ca03d84cb7e6409a0baeeeded8cd4f6b234bc9afc71433dbac75f72badd2b0c11adc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -488,37 +610,29 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9c8112f98c02144a8a9868f904d1f4f2b8d4f9896597c6c9d5869ab143a4b993",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xf0784b8b1f9707ff96ef9f687853fd3d5d41289aee05f7755664fd9ae7a97ae7",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a764000a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4520b",
+                "balance" : "0x4563918244f42906",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x05f58ef5",
+                "balance" : "0x05f5b7f0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x01" : "0x01"
-                }
             }
         },
         "pre" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_TxToSuicide_d0g1v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_TxToSuicide_d0g1v0.json
index a4267c122..044fa24bc 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_TxToSuicide_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_TxToSuicide_d0g1v0.json
@@ -1,8 +1,8 @@
 {
-    "refund_TxToSuicide_d0g1v0_EIP150" : {
+    "refund_TxToSuicide_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicide_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x697b",
-                    "hash" : "0xf9cf99d839fd5beb2a93c8108818329fe0ed1081939565c357b93a4a58d7a217",
-                    "mixHash" : "0xe604294e1a2d10a904ab29a25189df2ce43aa14e3784a84600722d0d6c99c4d2",
-                    "nonce" : "0xf3efab610f8d2bcd",
+                    "hash" : "0xd90acb2c6ad4733fe68f42f1d89e447b12895a8eb6fd24ee587b03d1b8c5acfe",
+                    "mixHash" : "0x076eebc385c25b7d493d6184171d428f5fa81df95cabdd5ecfd7cf792ecafc2d",
+                    "nonce" : "0x0cea8f2d25677157",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
-                    "receiptTrie" : "0x40bbf23bd4e483252b521ebcec3acf13024b955e91bc8523a0521b9337be8818",
-                    "stateRoot" : "0x762ed63d500f197bd382a95e6359ccfb3fc4bba6f104ef417facd5f85eb3544d",
+                    "receiptTrie" : "0x11b9a3af527495821ab161c2237f35f6a032d0dc5e9ee404f60ba12f9b7c26a9",
+                    "stateRoot" : "0x75afa0794e3fdc8c14173fb792e67c2eee87c11a9491d075acac0180c0a28079",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0762ed63d500f197bd382a95e6359ccfb3fc4bba6f104ef417facd5f85eb3544da0421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57a040bbf23bd4e483252b521ebcec3acf13024b955e91bc8523a0521b9337be8818b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082697b8203e880a0e604294e1a2d10a904ab29a25189df2ce43aa14e3784a84600722d0d6c99c4d288f3efab610f8d2bcdf861f85f800182ee4b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca070c4db9cd6e4f9991da63856665e47883e1253183e0c507012018e3f5aaecfdba02f2cf7c5954a2fa03ec7ee2bc6cfd72565016707e21326c3d3999f2447d553cec0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa075afa0794e3fdc8c14173fb792e67c2eee87c11a9491d075acac0180c0a28079a0421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57a011b9a3af527495821ab161c2237f35f6a032d0dc5e9ee404f60ba12f9b7c26a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082697b8203e880a0076eebc385c25b7d493d6184171d428f5fa81df95cabdd5ecfd7cf792ecafc2d880cea8f2d25677157f861f85f800182ee4b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca070c4db9cd6e4f9991da63856665e47883e1253183e0c507012018e3f5aaecfdba02f2cf7c5954a2fa03ec7ee2bc6cfd72565016707e21326c3d3999f2447d553cec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf9cf99d839fd5beb2a93c8108818329fe0ed1081939565c357b93a4a58d7a217",
-        "network" : "EIP150",
+        "lastblockhash" : "0xd90acb2c6ad4733fe68f42f1d89e447b12895a8eb6fd24ee587b03d1b8c5acfe",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "refund_TxToSuicide_d0g1v0_EIP158" : {
+    "refund_TxToSuicide_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicide_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -120,9 +127,122 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x697b",
-                    "hash" : "0x828b391be49bc1d50deafbdd4eba0ec4d5f246dd90d735c4e87b4114881216b8",
-                    "mixHash" : "0xfacb38462ddd5a831a81aeb7007fe92f41fac613db07a9686a98382b158369f1",
-                    "nonce" : "0x51dfed67198f0646",
+                    "hash" : "0x878c3a199cc3b1d2ac717ecb5cb392e8468c2397ca379fcb7ad462f45fc0d8c5",
+                    "mixHash" : "0xb6fc74032838e061f30af635f3b3c79e99bc5f99732ef2ebe4e063e22afa4b42",
+                    "nonce" : "0x2fda1ac74977da98",
+                    "number" : "0x01",
+                    "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
+                    "receiptTrie" : "0x11b9a3af527495821ab161c2237f35f6a032d0dc5e9ee404f60ba12f9b7c26a9",
+                    "stateRoot" : "0x75afa0794e3fdc8c14173fb792e67c2eee87c11a9491d075acac0180c0a28079",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa075afa0794e3fdc8c14173fb792e67c2eee87c11a9491d075acac0180c0a28079a0421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57a011b9a3af527495821ab161c2237f35f6a032d0dc5e9ee404f60ba12f9b7c26a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082697b8203e880a0b6fc74032838e061f30af635f3b3c79e99bc5f99732ef2ebe4e063e22afa4b42882fda1ac74977da98f861f85f800182ee4b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca070c4db9cd6e4f9991da63856665e47883e1253183e0c507012018e3f5aaecfdba02f2cf7c5954a2fa03ec7ee2bc6cfd72565016707e21326c3d3999f2447d553cec0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0xee4b",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x70c4db9cd6e4f9991da63856665e47883e1253183e0c507012018e3f5aaecfdb",
+                        "s" : "0x2f2cf7c5954a2fa03ec7ee2bc6cfd72565016707e21326c3d3999f2447d553ce",
+                        "to" : "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x39057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x878c3a199cc3b1d2ac717ecb5cb392e8468c2397ca379fcb7ad462f45fc0d8c5",
+        "network" : "Constantinople",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4697b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f5777b",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x05f5e100",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaae7baea6a6c7c4c2dfeb977efac326af552aaa" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x73095e7baea6a6c7c4c2dfeb977efac326af552d87ff",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            }
+        }
+    },
+    "refund_TxToSuicide_d0g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicide_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x697b",
+                    "hash" : "0xc931b4b692b325bc796dcd9159d2ce246b5b03dc9a8a39702e500f011887efab",
+                    "mixHash" : "0x266fcbfdebc7f2a763fba44089351a0b3cabc816c6b85f509acc3b652ac335db",
+                    "nonce" : "0xe472f77d4011f9a5",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
                     "receiptTrie" : "0x40bbf23bd4e483252b521ebcec3acf13024b955e91bc8523a0521b9337be8818",
@@ -131,7 +251,7 @@
                     "transactionsTrie" : "0x421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0762ed63d500f197bd382a95e6359ccfb3fc4bba6f104ef417facd5f85eb3544da0421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57a040bbf23bd4e483252b521ebcec3acf13024b955e91bc8523a0521b9337be8818b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082697b8203e880a0facb38462ddd5a831a81aeb7007fe92f41fac613db07a9686a98382b158369f18851dfed67198f0646f861f85f800182ee4b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca070c4db9cd6e4f9991da63856665e47883e1253183e0c507012018e3f5aaecfdba02f2cf7c5954a2fa03ec7ee2bc6cfd72565016707e21326c3d3999f2447d553cec0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0762ed63d500f197bd382a95e6359ccfb3fc4bba6f104ef417facd5f85eb3544da0421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57a040bbf23bd4e483252b521ebcec3acf13024b955e91bc8523a0521b9337be8818b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082697b8203e880a0266fcbfdebc7f2a763fba44089351a0b3cabc816c6b85f509acc3b652ac335db88e472f77d4011f9a5f861f85f800182ee4b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca070c4db9cd6e4f9991da63856665e47883e1253183e0c507012018e3f5aaecfdba02f2cf7c5954a2fa03ec7ee2bc6cfd72565016707e21326c3d3999f2447d553cec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x828b391be49bc1d50deafbdd4eba0ec4d5f246dd90d735c4e87b4114881216b8",
-        "network" : "EIP158",
+        "lastblockhash" : "0xc931b4b692b325bc796dcd9159d2ce246b5b03dc9a8a39702e500f011887efab",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -211,10 +331,10 @@
             }
         }
     },
-    "refund_TxToSuicide_d0g1v0_Frontier" : {
+    "refund_TxToSuicide_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicide_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -225,19 +345,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x2906",
-                    "hash" : "0x3ab3a204dfeadee793ece71afd7d044d2423cd5a95986f6c86e4a847f229b86c",
-                    "mixHash" : "0xb47dadd87ba5a1e9cddf186a504cad2de9a2b8964212e5a1235d9f020329e78b",
-                    "nonce" : "0xaea0ec20c53544fc",
+                    "gasUsed" : "0x697b",
+                    "hash" : "0x678e6e46145ebdbec395d8aaa96b12d156dc07e70eec2b3bce082f3ce4a105f4",
+                    "mixHash" : "0x46ca90daae38d15d82af570f292922d722692068bdc23a55cc7aaa857e327446",
+                    "nonce" : "0xfa0dffb54021a19a",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
-                    "receiptTrie" : "0xd4b15c293435a5d48086c5f74c34acb137fdd345d11d1210adaa4f280e1860f4",
-                    "stateRoot" : "0x6a48a28ef51d1648c351cc529b9da76a9c8d740c7973d169d24c24c199cbb83e",
+                    "receiptTrie" : "0x40bbf23bd4e483252b521ebcec3acf13024b955e91bc8523a0521b9337be8818",
+                    "stateRoot" : "0x762ed63d500f197bd382a95e6359ccfb3fc4bba6f104ef417facd5f85eb3544d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a48a28ef51d1648c351cc529b9da76a9c8d740c7973d169d24c24c199cbb83ea0421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57a0d4b15c293435a5d48086c5f74c34acb137fdd345d11d1210adaa4f280e1860f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a0b47dadd87ba5a1e9cddf186a504cad2de9a2b8964212e5a1235d9f020329e78b88aea0ec20c53544fcf861f85f800182ee4b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca070c4db9cd6e4f9991da63856665e47883e1253183e0c507012018e3f5aaecfdba02f2cf7c5954a2fa03ec7ee2bc6cfd72565016707e21326c3d3999f2447d553cec0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0762ed63d500f197bd382a95e6359ccfb3fc4bba6f104ef417facd5f85eb3544da0421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57a040bbf23bd4e483252b521ebcec3acf13024b955e91bc8523a0521b9337be8818b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082697b8203e880a046ca90daae38d15d82af570f292922d722692068bdc23a55cc7aaa857e32744688fa0dffb54021a19af861f85f800182ee4b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca070c4db9cd6e4f9991da63856665e47883e1253183e0c507012018e3f5aaecfdba02f2cf7c5954a2fa03ec7ee2bc6cfd72565016707e21326c3d3999f2447d553cec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3ab3a204dfeadee793ece71afd7d044d2423cd5a95986f6c86e4a847f229b86c",
-        "network" : "Frontier",
+        "lastblockhash" : "0x678e6e46145ebdbec395d8aaa96b12d156dc07e70eec2b3bce082f3ce4a105f4",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -285,14 +405,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f42906",
+                "balance" : "0x4563918244f4697b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x05f5b7f0",
+                "balance" : "0x05f5777b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -317,10 +437,10 @@
             }
         }
     },
-    "refund_TxToSuicide_d0g1v0_Homestead" : {
+    "refund_TxToSuicide_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicide_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +452,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x2906",
-                    "hash" : "0x98ed7d5208308e42ea9a84b639a5c72b5cd3f9499c1fbb04e8745306474970ef",
-                    "mixHash" : "0x30974509fa61d0cbcd7c87fcc228651515237256b17619e4b9585d9903cf278e",
-                    "nonce" : "0x2b5bf6087fcbd98e",
+                    "hash" : "0x532a536662ed39a04c1420631694163df6ae4f863d24c7e448a51d4450b40878",
+                    "mixHash" : "0xbdbc210bf1af9ead284d691bc3d16c218b5e254cf4452a4f64473291ebc3b3cb",
+                    "nonce" : "0xdcadb3e71cac58e8",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
                     "receiptTrie" : "0xd4b15c293435a5d48086c5f74c34acb137fdd345d11d1210adaa4f280e1860f4",
@@ -343,7 +463,7 @@
                     "transactionsTrie" : "0x421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a48a28ef51d1648c351cc529b9da76a9c8d740c7973d169d24c24c199cbb83ea0421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57a0d4b15c293435a5d48086c5f74c34acb137fdd345d11d1210adaa4f280e1860f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a030974509fa61d0cbcd7c87fcc228651515237256b17619e4b9585d9903cf278e882b5bf6087fcbd98ef861f85f800182ee4b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca070c4db9cd6e4f9991da63856665e47883e1253183e0c507012018e3f5aaecfdba02f2cf7c5954a2fa03ec7ee2bc6cfd72565016707e21326c3d3999f2447d553cec0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a48a28ef51d1648c351cc529b9da76a9c8d740c7973d169d24c24c199cbb83ea0421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57a0d4b15c293435a5d48086c5f74c34acb137fdd345d11d1210adaa4f280e1860f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a0bdbc210bf1af9ead284d691bc3d16c218b5e254cf4452a4f64473291ebc3b3cb88dcadb3e71cac58e8f861f85f800182ee4b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca070c4db9cd6e4f9991da63856665e47883e1253183e0c507012018e3f5aaecfdba02f2cf7c5954a2fa03ec7ee2bc6cfd72565016707e21326c3d3999f2447d553cec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +500,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x98ed7d5208308e42ea9a84b639a5c72b5cd3f9499c1fbb04e8745306474970ef",
-        "network" : "Homestead",
+        "lastblockhash" : "0x532a536662ed39a04c1420631694163df6ae4f863d24c7e448a51d4450b40878",
+        "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -423,10 +543,10 @@
             }
         }
     },
-    "refund_TxToSuicide_d0g1v0_Metropolis" : {
+    "refund_TxToSuicide_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicide_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -437,19 +557,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x989680",
-                    "gasUsed" : "0x697b",
-                    "hash" : "0xf79c10fc1a33c5b7d1b04718368ec50e7e56308a496d4fc82cf1193cca546677",
-                    "mixHash" : "0x779041dfcb883377ca476603a2163d95714c6ad7ac73356646c212c60184c50d",
-                    "nonce" : "0x90e35513a1ff6b17",
+                    "gasUsed" : "0x2906",
+                    "hash" : "0xdd790d9f3c10afc91ec1df53d9bc3650ebe60af855e12ffa0307d0712e6657e3",
+                    "mixHash" : "0x75ffe0ea0037c5d4185044f48fd4bda9dbde92a517a12abe72cda0aac7b1416c",
+                    "nonce" : "0x27c957804bc585b7",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
-                    "receiptTrie" : "0x11b9a3af527495821ab161c2237f35f6a032d0dc5e9ee404f60ba12f9b7c26a9",
-                    "stateRoot" : "0x75afa0794e3fdc8c14173fb792e67c2eee87c11a9491d075acac0180c0a28079",
+                    "receiptTrie" : "0xd4b15c293435a5d48086c5f74c34acb137fdd345d11d1210adaa4f280e1860f4",
+                    "stateRoot" : "0x6a48a28ef51d1648c351cc529b9da76a9c8d740c7973d169d24c24c199cbb83e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa075afa0794e3fdc8c14173fb792e67c2eee87c11a9491d075acac0180c0a28079a0421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57a011b9a3af527495821ab161c2237f35f6a032d0dc5e9ee404f60ba12f9b7c26a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082697b8203e880a0779041dfcb883377ca476603a2163d95714c6ad7ac73356646c212c60184c50d8890e35513a1ff6b17f861f85f800182ee4b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca070c4db9cd6e4f9991da63856665e47883e1253183e0c507012018e3f5aaecfdba02f2cf7c5954a2fa03ec7ee2bc6cfd72565016707e21326c3d3999f2447d553cec0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a48a28ef51d1648c351cc529b9da76a9c8d740c7973d169d24c24c199cbb83ea0421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57a0d4b15c293435a5d48086c5f74c34acb137fdd345d11d1210adaa4f280e1860f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a075ffe0ea0037c5d4185044f48fd4bda9dbde92a517a12abe72cda0aac7b1416c8827c957804bc585b7f861f85f800182ee4b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca070c4db9cd6e4f9991da63856665e47883e1253183e0c507012018e3f5aaecfdba02f2cf7c5954a2fa03ec7ee2bc6cfd72565016707e21326c3d3999f2447d553cec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +606,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf79c10fc1a33c5b7d1b04718368ec50e7e56308a496d4fc82cf1193cca546677",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xdd790d9f3c10afc91ec1df53d9bc3650ebe60af855e12ffa0307d0712e6657e3",
+        "network" : "Homestead",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "",
@@ -504,14 +617,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4697b",
+                "balance" : "0x4563918244f42906",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x05f5777b",
+                "balance" : "0x05f5b7f0",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_changeNonZeroStorage_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_changeNonZeroStorage_d0g0v0.json
index 4b4a1fa35..e0cb9156f 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_changeNonZeroStorage_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_changeNonZeroStorage_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "refund_changeNonZeroStorage_d0g0v0_EIP150" : {
+    "refund_changeNonZeroStorage_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_changeNonZeroStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x6596",
-                    "hash" : "0x2137c9f09d88cbcf1ace3e3e85a1412b477b3b79685f661c87bcac3362317f1b",
-                    "mixHash" : "0x59642a98abdfbf0526a83e705c5913aad142e49d0169bbf506f6d06d58a3d22e",
-                    "nonce" : "0xc10b0badf9d8945e",
+                    "hash" : "0xe1f2f9ccbe138b8aa2b90d129f97858a69436cdb1a4aede15265021a3f51fe59",
+                    "mixHash" : "0x902a053b2a98493955268b0965e331bdd249e4f83642de6effada20872ef7568",
+                    "nonce" : "0xb31ce744f0000beb",
                     "number" : "0x01",
                     "parentHash" : "0xbb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532",
-                    "receiptTrie" : "0x8fdeca3b82f7d8c5ec36ee57dc7fbcef1e990b5e12a6c9f5a6cc8348783173f4",
-                    "stateRoot" : "0x69b46397c00acb37f9ad70fb73a79330f83e16d195e224ca064c5f918fd76399",
+                    "receiptTrie" : "0xab6d3e3083ddefb7cd463e1270c07a126b51ab736a8d8dcc95a910a73ece71e9",
+                    "stateRoot" : "0x2a4e54ba4e35ed31d07ea0e58b046f7fe9adc8e9bf9009de8796e4069cba9779",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0bb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069b46397c00acb37f9ad70fb73a79330f83e16d195e224ca064c5f918fd76399a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da08fdeca3b82f7d8c5ec36ee57dc7fbcef1e990b5e12a6c9f5a6cc8348783173f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265968203e880a059642a98abdfbf0526a83e705c5913aad142e49d0169bbf506f6d06d58a3d22e88c10b0badf9d8945ef862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "rlp" : "0xf9025ff901f7a0bb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a4e54ba4e35ed31d07ea0e58b046f7fe9adc8e9bf9009de8796e4069cba9779a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da0ab6d3e3083ddefb7cd463e1270c07a126b51ab736a8d8dcc95a910a73ece71e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265968203e880a0902a053b2a98493955268b0965e331bdd249e4f83642de6effada20872ef756888b31ce744f0000bebf862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0445cf3016290f36c63929ab6ce63ebefda5c84f0e6c84ebb513e801d23156310a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2137c9f09d88cbcf1ace3e3e85a1412b477b3b79685f661c87bcac3362317f1b",
-        "network" : "EIP150",
+        "lastblockhash" : "0xe1f2f9ccbe138b8aa2b90d129f97858a69436cdb1a4aede15265021a3f51fe59",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6017600155",
@@ -106,10 +113,10 @@
             }
         }
     },
-    "refund_changeNonZeroStorage_d0g0v0_EIP158" : {
+    "refund_changeNonZeroStorage_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/stRefundTest/refund_changeNonZeroStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -121,18 +128,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x6596",
-                    "hash" : "0x2fec5b795c1bb51ef3f5fa8a9e9af5493a20ffd51941d2428af0bf86d432d400",
-                    "mixHash" : "0x72a9311040c1448a6ca189c35280d73601973075b83ed820642e4dad1c5be140",
-                    "nonce" : "0x742694018e054f93",
+                    "hash" : "0x5f9d9b14bebcfef23af5275451197792e2795bc2f94b170c5aca9bc3ffc0436f",
+                    "mixHash" : "0x09273604caf27dd35307a9885123dc1328f5bc9e4139384f5bc2eb4c0d4775f7",
+                    "nonce" : "0x4ccf1f7b8ca31edb",
                     "number" : "0x01",
                     "parentHash" : "0xbb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532",
-                    "receiptTrie" : "0x8fdeca3b82f7d8c5ec36ee57dc7fbcef1e990b5e12a6c9f5a6cc8348783173f4",
-                    "stateRoot" : "0x69b46397c00acb37f9ad70fb73a79330f83e16d195e224ca064c5f918fd76399",
+                    "receiptTrie" : "0xab6d3e3083ddefb7cd463e1270c07a126b51ab736a8d8dcc95a910a73ece71e9",
+                    "stateRoot" : "0x2a4e54ba4e35ed31d07ea0e58b046f7fe9adc8e9bf9009de8796e4069cba9779",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0bb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069b46397c00acb37f9ad70fb73a79330f83e16d195e224ca064c5f918fd76399a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da08fdeca3b82f7d8c5ec36ee57dc7fbcef1e990b5e12a6c9f5a6cc8348783173f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265968203e880a072a9311040c1448a6ca189c35280d73601973075b83ed820642e4dad1c5be14088742694018e054f93f862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "rlp" : "0xf9025ff901f7a0bb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a4e54ba4e35ed31d07ea0e58b046f7fe9adc8e9bf9009de8796e4069cba9779a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da0ab6d3e3083ddefb7cd463e1270c07a126b51ab736a8d8dcc95a910a73ece71e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265968203e880a009273604caf27dd35307a9885123dc1328f5bc9e4139384f5bc2eb4c0d4775f7884ccf1f7b8ca31edbf862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,9 +176,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0445cf3016290f36c63929ab6ce63ebefda5c84f0e6c84ebb513e801d23156310a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2fec5b795c1bb51ef3f5fa8a9e9af5493a20ffd51941d2428af0bf86d432d400",
-        "network" : "EIP158",
+        "lastblockhash" : "0x5f9d9b14bebcfef23af5275451197792e2795bc2f94b170c5aca9bc3ffc0436f",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6017600155",
@@ -213,10 +227,10 @@
             }
         }
     },
-    "refund_changeNonZeroStorage_d0g0v0_Frontier" : {
+    "refund_changeNonZeroStorage_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_changeNonZeroStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -228,9 +242,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x6596",
-                    "hash" : "0xfa664e03c17c8e394bcf071e57ddc01dbd85870d577fa16e265d28a8bff8ef52",
-                    "mixHash" : "0x8cce4c59f3933978fd6f1965fec89a448ad2b7caf76f1c40f2591e01e3384b5e",
-                    "nonce" : "0x0ccdcef9b6a5918c",
+                    "hash" : "0xff420d7184d79eacd27afddf7394ee96317ee28cbc6dc6caff4bbf3b1a6acd1b",
+                    "mixHash" : "0xe0f9b3b25e684d3f95becb5ddbf327a2fa97a6f70873800010f2dcd74e7d897a",
+                    "nonce" : "0x54be95090481bda3",
                     "number" : "0x01",
                     "parentHash" : "0xbb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532",
                     "receiptTrie" : "0x8fdeca3b82f7d8c5ec36ee57dc7fbcef1e990b5e12a6c9f5a6cc8348783173f4",
@@ -239,7 +253,7 @@
                     "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0bb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069b46397c00acb37f9ad70fb73a79330f83e16d195e224ca064c5f918fd76399a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da08fdeca3b82f7d8c5ec36ee57dc7fbcef1e990b5e12a6c9f5a6cc8348783173f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265968203e880a08cce4c59f3933978fd6f1965fec89a448ad2b7caf76f1c40f2591e01e3384b5e880ccdcef9b6a5918cf862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "rlp" : "0xf9025ff901f7a0bb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069b46397c00acb37f9ad70fb73a79330f83e16d195e224ca064c5f918fd76399a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da08fdeca3b82f7d8c5ec36ee57dc7fbcef1e990b5e12a6c9f5a6cc8348783173f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265968203e880a0e0f9b3b25e684d3f95becb5ddbf327a2fa97a6f70873800010f2dcd74e7d897a8854be95090481bda3f862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -276,8 +290,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0445cf3016290f36c63929ab6ce63ebefda5c84f0e6c84ebb513e801d23156310a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfa664e03c17c8e394bcf071e57ddc01dbd85870d577fa16e265d28a8bff8ef52",
-        "network" : "Frontier",
+        "lastblockhash" : "0xff420d7184d79eacd27afddf7394ee96317ee28cbc6dc6caff4bbf3b1a6acd1b",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -320,10 +334,10 @@
             }
         }
     },
-    "refund_changeNonZeroStorage_d0g0v0_Homestead" : {
+    "refund_changeNonZeroStorage_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_changeNonZeroStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -335,9 +349,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x6596",
-                    "hash" : "0x9e1d7a9d01c500113cc198d8b6b1f8472fdcd74852ee014c77301b265793cb3e",
-                    "mixHash" : "0x69a50bd41edb0f8d2bbb8e75b4632cd9bc02496c1a0d43f4e731cf42d313eb5a",
-                    "nonce" : "0x46d81cdb410f809d",
+                    "hash" : "0x30338ed0ad2db0d03c27fdd244feb8c2f2a4952f7430c9ee129ccad684b35da1",
+                    "mixHash" : "0x0c0574738fe078645b8fddf4770bd9c42d80884de1721d9e9c5cef0458b45a3f",
+                    "nonce" : "0x83a472601c39fa3e",
                     "number" : "0x01",
                     "parentHash" : "0xbb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532",
                     "receiptTrie" : "0x8fdeca3b82f7d8c5ec36ee57dc7fbcef1e990b5e12a6c9f5a6cc8348783173f4",
@@ -346,7 +360,7 @@
                     "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0bb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069b46397c00acb37f9ad70fb73a79330f83e16d195e224ca064c5f918fd76399a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da08fdeca3b82f7d8c5ec36ee57dc7fbcef1e990b5e12a6c9f5a6cc8348783173f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265968203e880a069a50bd41edb0f8d2bbb8e75b4632cd9bc02496c1a0d43f4e731cf42d313eb5a8846d81cdb410f809df862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "rlp" : "0xf9025ff901f7a0bb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069b46397c00acb37f9ad70fb73a79330f83e16d195e224ca064c5f918fd76399a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da08fdeca3b82f7d8c5ec36ee57dc7fbcef1e990b5e12a6c9f5a6cc8348783173f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265968203e880a00c0574738fe078645b8fddf4770bd9c42d80884de1721d9e9c5cef0458b45a3f8883a472601c39fa3ef862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -383,8 +397,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0445cf3016290f36c63929ab6ce63ebefda5c84f0e6c84ebb513e801d23156310a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9e1d7a9d01c500113cc198d8b6b1f8472fdcd74852ee014c77301b265793cb3e",
-        "network" : "Homestead",
+        "lastblockhash" : "0x30338ed0ad2db0d03c27fdd244feb8c2f2a4952f7430c9ee129ccad684b35da1",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -427,10 +441,10 @@
             }
         }
     },
-    "refund_changeNonZeroStorage_d0g0v0_Metropolis" : {
+    "refund_changeNonZeroStorage_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_changeNonZeroStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -442,18 +456,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x6596",
-                    "hash" : "0xb8e4b6b93a13e07c35418b75516a4262567307c66c5e40e1210b4e5ba3e04ef8",
-                    "mixHash" : "0xe1bbbb52bb29012f601c2a99a05834f79633f75e5648bd15d65e1631fe2cc133",
-                    "nonce" : "0x955a419f444a30d6",
+                    "hash" : "0x082c860b250060633f86b38f9908f9c7d6f1784ac4b4b5a7dd37eb0799fe0596",
+                    "mixHash" : "0x155e2e3361e8a30b6f5cabadf8acf9c0891a2bb11c12e234798dc775e60977f9",
+                    "nonce" : "0x4867d81b5fe4b649",
                     "number" : "0x01",
                     "parentHash" : "0xbb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532",
-                    "receiptTrie" : "0xab6d3e3083ddefb7cd463e1270c07a126b51ab736a8d8dcc95a910a73ece71e9",
-                    "stateRoot" : "0x2a4e54ba4e35ed31d07ea0e58b046f7fe9adc8e9bf9009de8796e4069cba9779",
+                    "receiptTrie" : "0x8fdeca3b82f7d8c5ec36ee57dc7fbcef1e990b5e12a6c9f5a6cc8348783173f4",
+                    "stateRoot" : "0x69b46397c00acb37f9ad70fb73a79330f83e16d195e224ca064c5f918fd76399",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0bb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a4e54ba4e35ed31d07ea0e58b046f7fe9adc8e9bf9009de8796e4069cba9779a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da0ab6d3e3083ddefb7cd463e1270c07a126b51ab736a8d8dcc95a910a73ece71e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265968203e880a0e1bbbb52bb29012f601c2a99a05834f79633f75e5648bd15d65e1631fe2cc13388955a419f444a30d6f862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "rlp" : "0xf9025ff901f7a0bb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069b46397c00acb37f9ad70fb73a79330f83e16d195e224ca064c5f918fd76399a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da08fdeca3b82f7d8c5ec36ee57dc7fbcef1e990b5e12a6c9f5a6cc8348783173f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265968203e880a0155e2e3361e8a30b6f5cabadf8acf9c0891a2bb11c12e234798dc775e60977f9884867d81b5fe4b649f862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -490,16 +504,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0445cf3016290f36c63929ab6ce63ebefda5c84f0e6c84ebb513e801d23156310a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb8e4b6b93a13e07c35418b75516a4262567307c66c5e40e1210b4e5ba3e04ef8",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x082c860b250060633f86b38f9908f9c7d6f1784ac4b4b5a7dd37eb0799fe0596",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x6017600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x17"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f46596",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0edca0",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6017600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0f4240",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "refund_changeNonZeroStorage_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_changeNonZeroStorage_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x6596",
+                    "hash" : "0xdc2672469e457f434973282452a081a3e15b703d604b22939eeae8a47c57ffa8",
+                    "mixHash" : "0x2727404b30f0883aad52c4eca4bc940c23fdebecc270be0c513922e12df127a4",
+                    "nonce" : "0x35e3be588345c2f1",
+                    "number" : "0x01",
+                    "parentHash" : "0xbb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532",
+                    "receiptTrie" : "0x8fdeca3b82f7d8c5ec36ee57dc7fbcef1e990b5e12a6c9f5a6cc8348783173f4",
+                    "stateRoot" : "0x69b46397c00acb37f9ad70fb73a79330f83e16d195e224ca064c5f918fd76399",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a0bb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069b46397c00acb37f9ad70fb73a79330f83e16d195e224ca064c5f918fd76399a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da08fdeca3b82f7d8c5ec36ee57dc7fbcef1e990b5e12a6c9f5a6cc8348783173f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265968203e880a02727404b30f0883aad52c4eca4bc940c23fdebecc270be0c513922e12df127a48835e3be588345c2f1f862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x037c94",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3",
+                        "s" : "0x5a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6ba",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0xbb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x445cf3016290f36c63929ab6ce63ebefda5c84f0e6c84ebb513e801d23156310",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0445cf3016290f36c63929ab6ce63ebefda5c84f0e6c84ebb513e801d23156310a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdc2672469e457f434973282452a081a3e15b703d604b22939eeae8a47c57ffa8",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6017600155",
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_getEtherBack_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_getEtherBack_d0g0v0.json
index d27e43016..8ab4f9790 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_getEtherBack_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_getEtherBack_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "refund_getEtherBack_d0g0v0_EIP150" : {
+    "refund_getEtherBack_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_getEtherBack_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x037c94",
                     "gasUsed" : "0x32cb",
-                    "hash" : "0x2086a01e202ee8da436ed55340700eb700db6f5c48a870a76b225f5f78282d99",
-                    "mixHash" : "0x173a106dece62613c6855061f5f695870747b421710b952e3517d65880348dc7",
-                    "nonce" : "0x6b3057b96562f000",
+                    "hash" : "0x175bb685921ffebdd0d287b6d72ce7d5939a445c142be1bacee820d74ab7110e",
+                    "mixHash" : "0x90541211314570c93b4f600c885f8d9ef0f59ae7b3f8b673271fd7b66908155b",
+                    "nonce" : "0x8fce71e8effd383c",
                     "number" : "0x01",
                     "parentHash" : "0x5ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0",
-                    "receiptTrie" : "0x9a8f2594bc340e04d667c3033d4ae10f3b8cb293a02e330011db139a0ec5ffde",
-                    "stateRoot" : "0xd79d799eacabbaaa2cede8b5ad1ea8a715cb7c0f4071056547ef9369f86e9f0d",
+                    "receiptTrie" : "0xbf746beefa19da059d5810cb7b32cde1e5afa402222d0cbeea17736d3f724c70",
+                    "stateRoot" : "0x898a0f26b0907e4d6d869c3bc00cf2059b090ec0eaf518e4b39f34724aa02928",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d79d799eacabbaaa2cede8b5ad1ea8a715cb7c0f4071056547ef9369f86e9f0da057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da09a8f2594bc340e04d667c3033d4ae10f3b8cb293a02e330011db139a0ec5ffdeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183037c948232cb8203e880a0173a106dece62613c6855061f5f695870747b421710b952e3517d65880348dc7886b3057b96562f000f862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "rlp" : "0xf9025ff901f7a05ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0898a0f26b0907e4d6d869c3bc00cf2059b090ec0eaf518e4b39f34724aa02928a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da0bf746beefa19da059d5810cb7b32cde1e5afa402222d0cbeea17736d3f724c70b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183037c948232cb8203e880a090541211314570c93b4f600c885f8d9ef0f59ae7b3f8b673271fd7b66908155b888fce71e8effd383cf862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,9 +62,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0635db71a4815d48946f7a1a66cfc0a271fa0f98716f190c2771a59ec6fcb6e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083037c94808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2086a01e202ee8da436ed55340700eb700db6f5c48a870a76b225f5f78282d99",
-        "network" : "EIP150",
+        "lastblockhash" : "0x175bb685921ffebdd0d287b6d72ce7d5939a445c142be1bacee820d74ab7110e",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6000600155",
@@ -105,10 +112,10 @@
             }
         }
     },
-    "refund_getEtherBack_d0g0v0_EIP158" : {
+    "refund_getEtherBack_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/stRefundTest/refund_getEtherBack_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -120,18 +127,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x037c94",
                     "gasUsed" : "0x32cb",
-                    "hash" : "0x072389d8f6181d6362586e5a08466196bbf06e9b3eb9e0318222dc075780466e",
-                    "mixHash" : "0x960b3cb42543cb2da7599badacb68117616a56b5bc35285574e01aab5fd9e0ab",
-                    "nonce" : "0x96f974e33cae5059",
+                    "hash" : "0xf9123391efc86d10537d016e62411f00853502351ae57fe3f4d875619667db19",
+                    "mixHash" : "0x726b748b7a10cd3480ccc4768e23747c0277164351e3646e14ef337513094118",
+                    "nonce" : "0xced455131ca976ad",
                     "number" : "0x01",
                     "parentHash" : "0x5ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0",
-                    "receiptTrie" : "0x9a8f2594bc340e04d667c3033d4ae10f3b8cb293a02e330011db139a0ec5ffde",
-                    "stateRoot" : "0xd79d799eacabbaaa2cede8b5ad1ea8a715cb7c0f4071056547ef9369f86e9f0d",
+                    "receiptTrie" : "0xbf746beefa19da059d5810cb7b32cde1e5afa402222d0cbeea17736d3f724c70",
+                    "stateRoot" : "0x898a0f26b0907e4d6d869c3bc00cf2059b090ec0eaf518e4b39f34724aa02928",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d79d799eacabbaaa2cede8b5ad1ea8a715cb7c0f4071056547ef9369f86e9f0da057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da09a8f2594bc340e04d667c3033d4ae10f3b8cb293a02e330011db139a0ec5ffdeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183037c948232cb8203e880a0960b3cb42543cb2da7599badacb68117616a56b5bc35285574e01aab5fd9e0ab8896f974e33cae5059f862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "rlp" : "0xf9025ff901f7a05ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0898a0f26b0907e4d6d869c3bc00cf2059b090ec0eaf518e4b39f34724aa02928a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da0bf746beefa19da059d5810cb7b32cde1e5afa402222d0cbeea17736d3f724c70b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183037c948232cb8203e880a0726b748b7a10cd3480ccc4768e23747c0277164351e3646e14ef33751309411888ced455131ca976adf862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -168,9 +175,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0635db71a4815d48946f7a1a66cfc0a271fa0f98716f190c2771a59ec6fcb6e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083037c94808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x072389d8f6181d6362586e5a08466196bbf06e9b3eb9e0318222dc075780466e",
-        "network" : "EIP158",
+        "lastblockhash" : "0xf9123391efc86d10537d016e62411f00853502351ae57fe3f4d875619667db19",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6000600155",
@@ -211,10 +225,10 @@
             }
         }
     },
-    "refund_getEtherBack_d0g0v0_Frontier" : {
+    "refund_getEtherBack_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_getEtherBack_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -226,9 +240,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x037c94",
                     "gasUsed" : "0x32cb",
-                    "hash" : "0xaa321fb1cf6d5262d311705a834848e061b9fe69d20afde2caccfb9797669ebb",
-                    "mixHash" : "0x5b3acdcb5ffccaa65d1bc85cab796afc7c788f7803fe8269ac0326beedcccf58",
-                    "nonce" : "0x12c3351b0e9ac6b7",
+                    "hash" : "0x2c0ed24c4e5976d91d9c99652ee769b6dbdfd7b982c299f6151e010837cf5b4e",
+                    "mixHash" : "0xcd444f7ee97c36ea762e77ad1eb2ef50ca853743ed5dc5301c0c1d5921d140a1",
+                    "nonce" : "0xd1af03d661672014",
                     "number" : "0x01",
                     "parentHash" : "0x5ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0",
                     "receiptTrie" : "0x9a8f2594bc340e04d667c3033d4ae10f3b8cb293a02e330011db139a0ec5ffde",
@@ -237,7 +251,7 @@
                     "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d79d799eacabbaaa2cede8b5ad1ea8a715cb7c0f4071056547ef9369f86e9f0da057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da09a8f2594bc340e04d667c3033d4ae10f3b8cb293a02e330011db139a0ec5ffdeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183037c948232cb8203e880a05b3acdcb5ffccaa65d1bc85cab796afc7c788f7803fe8269ac0326beedcccf588812c3351b0e9ac6b7f862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "rlp" : "0xf9025ff901f7a05ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d79d799eacabbaaa2cede8b5ad1ea8a715cb7c0f4071056547ef9369f86e9f0da057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da09a8f2594bc340e04d667c3033d4ae10f3b8cb293a02e330011db139a0ec5ffdeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183037c948232cb8203e880a0cd444f7ee97c36ea762e77ad1eb2ef50ca853743ed5dc5301c0c1d5921d140a188d1af03d661672014f862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -274,8 +288,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0635db71a4815d48946f7a1a66cfc0a271fa0f98716f190c2771a59ec6fcb6e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083037c94808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaa321fb1cf6d5262d311705a834848e061b9fe69d20afde2caccfb9797669ebb",
-        "network" : "Frontier",
+        "lastblockhash" : "0x2c0ed24c4e5976d91d9c99652ee769b6dbdfd7b982c299f6151e010837cf5b4e",
+        "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -317,10 +331,10 @@
             }
         }
     },
-    "refund_getEtherBack_d0g0v0_Homestead" : {
+    "refund_getEtherBack_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_getEtherBack_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -332,9 +346,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x037c94",
                     "gasUsed" : "0x32cb",
-                    "hash" : "0xf36799c9ff6f090852d8fdb5a4910085bcf16add32b9b19e2e748cf41265702f",
-                    "mixHash" : "0x1ed1ef3e3d6d64694ae1ac2b501b7dd02b4ce0e3792683aeed6617be81a5b750",
-                    "nonce" : "0xb5690e93d5e3fcaf",
+                    "hash" : "0x3f11d10227e10bd237e18c348544e5f84a8e154c0ef4f3459fc085019a0f756d",
+                    "mixHash" : "0x6c692dd3ab0b1537c50c33d82426e041b3fe1d7a8cbc63813be95b6a86f3a48d",
+                    "nonce" : "0x51fc93468ffbe56f",
                     "number" : "0x01",
                     "parentHash" : "0x5ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0",
                     "receiptTrie" : "0x9a8f2594bc340e04d667c3033d4ae10f3b8cb293a02e330011db139a0ec5ffde",
@@ -343,7 +357,7 @@
                     "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d79d799eacabbaaa2cede8b5ad1ea8a715cb7c0f4071056547ef9369f86e9f0da057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da09a8f2594bc340e04d667c3033d4ae10f3b8cb293a02e330011db139a0ec5ffdeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183037c948232cb8203e880a01ed1ef3e3d6d64694ae1ac2b501b7dd02b4ce0e3792683aeed6617be81a5b75088b5690e93d5e3fcaff862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "rlp" : "0xf9025ff901f7a05ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d79d799eacabbaaa2cede8b5ad1ea8a715cb7c0f4071056547ef9369f86e9f0da057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da09a8f2594bc340e04d667c3033d4ae10f3b8cb293a02e330011db139a0ec5ffdeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183037c948232cb8203e880a06c692dd3ab0b1537c50c33d82426e041b3fe1d7a8cbc63813be95b6a86f3a48d8851fc93468ffbe56ff862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -380,8 +394,8 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0635db71a4815d48946f7a1a66cfc0a271fa0f98716f190c2771a59ec6fcb6e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083037c94808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf36799c9ff6f090852d8fdb5a4910085bcf16add32b9b19e2e748cf41265702f",
-        "network" : "Homestead",
+        "lastblockhash" : "0x3f11d10227e10bd237e18c348544e5f84a8e154c0ef4f3459fc085019a0f756d",
+        "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
@@ -423,10 +437,10 @@
             }
         }
     },
-    "refund_getEtherBack_d0g0v0_Metropolis" : {
+    "refund_getEtherBack_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_getEtherBack_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -438,18 +452,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x037c94",
                     "gasUsed" : "0x32cb",
-                    "hash" : "0x7c601415722d9c05e2738335e018c581537efc7918d1cca94373661ec1ff97ce",
-                    "mixHash" : "0x65e4dbe9e034d86175639d644610e5b2d3b054f472309a2bb55ed33beff1db46",
-                    "nonce" : "0xee6d0455bbed84cd",
+                    "hash" : "0x6c1b68aafc6f1c966ef3726282c2fd77a6119eaa2773466103b8b955a12694e7",
+                    "mixHash" : "0x771bb712dbb8883bdde03d09792bf2ef0e1b87f3e0a9f30f555e0f521b588e3c",
+                    "nonce" : "0x27ad3bd51950ec54",
                     "number" : "0x01",
                     "parentHash" : "0x5ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0",
-                    "receiptTrie" : "0xbf746beefa19da059d5810cb7b32cde1e5afa402222d0cbeea17736d3f724c70",
-                    "stateRoot" : "0x898a0f26b0907e4d6d869c3bc00cf2059b090ec0eaf518e4b39f34724aa02928",
+                    "receiptTrie" : "0x9a8f2594bc340e04d667c3033d4ae10f3b8cb293a02e330011db139a0ec5ffde",
+                    "stateRoot" : "0xd79d799eacabbaaa2cede8b5ad1ea8a715cb7c0f4071056547ef9369f86e9f0d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0898a0f26b0907e4d6d869c3bc00cf2059b090ec0eaf518e4b39f34724aa02928a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da0bf746beefa19da059d5810cb7b32cde1e5afa402222d0cbeea17736d3f724c70b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183037c948232cb8203e880a065e4dbe9e034d86175639d644610e5b2d3b054f472309a2bb55ed33beff1db4688ee6d0455bbed84cdf862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "rlp" : "0xf9025ff901f7a05ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d79d799eacabbaaa2cede8b5ad1ea8a715cb7c0f4071056547ef9369f86e9f0da057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da09a8f2594bc340e04d667c3033d4ae10f3b8cb293a02e330011db139a0ec5ffdeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183037c948232cb8203e880a0771bb712dbb8883bdde03d09792bf2ef0e1b87f3e0a9f30f555e0f521b588e3c8827ad3bd51950ec54f862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -486,16 +500,115 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0635db71a4815d48946f7a1a66cfc0a271fa0f98716f190c2771a59ec6fcb6e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083037c94808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7c601415722d9c05e2738335e018c581537efc7918d1cca94373661ec1ff97ce",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x6c1b68aafc6f1c966ef3726282c2fd77a6119eaa2773466103b8b955a12694e7",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a764000a",
+                "code" : "0x6000600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f432cb",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x22aaf3",
                 "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6000600155",
                 "nonce" : "0x00",
                 "storage" : {
+                    "0x01" : "0x01"
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x22ddc8",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "refund_getEtherBack_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_getEtherBack_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x037c94",
+                    "gasUsed" : "0x32cb",
+                    "hash" : "0x02a4eae8dc7f0d2781651380b849edbb134f1577b9ad02cc5e11ee89ae5a9f53",
+                    "mixHash" : "0xc9da694379e6722c0ffe8a4ab6c050cdbbb74e0e7f50d64f87fd7b365d2e9d3e",
+                    "nonce" : "0x88ded8d004d7b02f",
+                    "number" : "0x01",
+                    "parentHash" : "0x5ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0",
+                    "receiptTrie" : "0x9a8f2594bc340e04d667c3033d4ae10f3b8cb293a02e330011db139a0ec5ffde",
+                    "stateRoot" : "0xd79d799eacabbaaa2cede8b5ad1ea8a715cb7c0f4071056547ef9369f86e9f0d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9025ff901f7a05ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d79d799eacabbaaa2cede8b5ad1ea8a715cb7c0f4071056547ef9369f86e9f0da057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da09a8f2594bc340e04d667c3033d4ae10f3b8cb293a02e330011db139a0ec5ffdeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183037c948232cb8203e880a0c9da694379e6722c0ffe8a4ab6c050cdbbb74e0e7f50d64f87fd7b365d2e9d3e8888ded8d004d7b02ff862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x037c94",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3",
+                        "s" : "0x5a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6ba",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1b",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x037c94",
+            "gasUsed" : "0x00",
+            "hash" : "0x5ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x635db71a4815d48946f7a1a66cfc0a271fa0f98716f190c2771a59ec6fcb6e9f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0635db71a4815d48946f7a1a66cfc0a271fa0f98716f190c2771a59ec6fcb6e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083037c94808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x02a4eae8dc7f0d2781651380b849edbb134f1577b9ad02cc5e11ee89ae5a9f53",
+        "network" : "Homestead",
+        "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6000600155",
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_multimpleSuicide_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_multimpleSuicide_d0g0v0.json
index 88b5e0938..6e64ad397 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_multimpleSuicide_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_multimpleSuicide_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "refund_multimpleSuicide_d0g0v0_EIP150" : {
+    "refund_multimpleSuicide_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_multimpleSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x4104",
-                    "hash" : "0x8b726ae06ab6400fb9300c35eb3a6368c31712e698c39d08572702bf4ad4a2bf",
-                    "mixHash" : "0x17e920675bc36d3f8df3e37f4dbe2f793ee1dca4fb5e574c268c64b4c7c81c43",
-                    "nonce" : "0xd02770ad2ef44bf9",
+                    "gasUsed" : "0x4154",
+                    "hash" : "0xeea198453771799efd91fa3fef1005e19269cfae98791cc384e8b2f0fdd2c977",
+                    "mixHash" : "0x23b6307a87ba19eb65426cf2916f1c10c00507cb212fd7bf51b317defdda33f6",
+                    "nonce" : "0xbec807b958e2da14",
                     "number" : "0x01",
                     "parentHash" : "0x26ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4b",
-                    "receiptTrie" : "0x34532f100dfed5223409562f738817d86f50cd29fbe3623268cdd90ff1935e94",
-                    "stateRoot" : "0x69a1ef0bbd1465b8898c883c68d085963bd1816592550f04ede94930d531ca8a",
+                    "receiptTrie" : "0x2ab355f6ada4631292453b5e8b436026295531df25a4ca97b2b94d31c34d0c3c",
+                    "stateRoot" : "0xd469f4f0636ac70d7c3d3cdbefbfbd4db732a0607aec822a1a69c8e877647242",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f7a026ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069a1ef0bbd1465b8898c883c68d085963bd1816592550f04ede94930d531ca8aa04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a034532f100dfed5223409562f738817d86f50cd29fbe3623268cdd90ff1935e94b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408241048203e880a017e920675bc36d3f8df3e37f4dbe2f793ee1dca4fb5e574c268c64b4c7c81c4388d02770ad2ef44bf9f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
+                "rlp" : "0xf90263f901f7a026ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d469f4f0636ac70d7c3d3cdbefbfbd4db732a0607aec822a1a69c8e877647242a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a02ab355f6ada4631292453b5e8b436026295531df25a4ca97b2b94d31c34d0c3cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408241548203e880a023b6307a87ba19eb65426cf2916f1c10c00507cb212fd7bf51b317defdda33f688bec807b958e2da14f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,18 +62,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03de4c88ce71baf0bf8c4b23828faf822f30a1b43a22485fb23fea9ca19765f90a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8b726ae06ab6400fb9300c35eb3a6368c31712e698c39d08572702bf4ad4a2bf",
-        "network" : "EIP150",
+        "lastblockhash" : "0xeea198453771799efd91fa3fef1005e19269cfae98791cc384e8b2f0fdd2c977",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f44104",
+                "balance" : "0x4563918244f44154",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0452dc",
+                "balance" : "0x04528c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -97,10 +104,10 @@
             }
         }
     },
-    "refund_multimpleSuicide_d0g0v0_EIP158" : {
+    "refund_multimpleSuicide_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/stRefundTest/refund_multimpleSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -112,18 +119,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x4154",
-                    "hash" : "0x2161848ddbdb26b607c0d18c8dd6ebba47699603ff29e142efc3c0250f48121f",
-                    "mixHash" : "0xf6391fcaef55523a45b39dfd7058056b9ece1331fe961b9f224872158ff79bb1",
-                    "nonce" : "0x38e8e96039064ae2",
+                    "hash" : "0x7bd029ebca586693cb22f7260183d309866847957232ef2bea853115a16b057c",
+                    "mixHash" : "0xd0ed9c6f98298956abf76878076640749d9e69a7d721144da6cdeb714e3d16a1",
+                    "nonce" : "0xc1909ff88da1ff48",
                     "number" : "0x01",
                     "parentHash" : "0x26ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4b",
-                    "receiptTrie" : "0x85b54e85e29864066a2bb39857fa3a2cc132361f160c4ef51c3058a3d049809f",
-                    "stateRoot" : "0xb3726515be923f2507e5d41bcf3fc3e0c9814037da6849c20c54e5a977f43910",
+                    "receiptTrie" : "0x2ab355f6ada4631292453b5e8b436026295531df25a4ca97b2b94d31c34d0c3c",
+                    "stateRoot" : "0xd469f4f0636ac70d7c3d3cdbefbfbd4db732a0607aec822a1a69c8e877647242",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f7a026ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3726515be923f2507e5d41bcf3fc3e0c9814037da6849c20c54e5a977f43910a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a085b54e85e29864066a2bb39857fa3a2cc132361f160c4ef51c3058a3d049809fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408241548203e880a0f6391fcaef55523a45b39dfd7058056b9ece1331fe961b9f224872158ff79bb18838e8e96039064ae2f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
+                "rlp" : "0xf90263f901f7a026ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d469f4f0636ac70d7c3d3cdbefbfbd4db732a0607aec822a1a69c8e877647242a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a02ab355f6ada4631292453b5e8b436026295531df25a4ca97b2b94d31c34d0c3cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408241548203e880a0d0ed9c6f98298956abf76878076640749d9e69a7d721144da6cdeb714e3d16a188c1909ff88da1ff48f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -160,9 +167,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03de4c88ce71baf0bf8c4b23828faf822f30a1b43a22485fb23fea9ca19765f90a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2161848ddbdb26b607c0d18c8dd6ebba47699603ff29e142efc3c0250f48121f",
-        "network" : "EIP158",
+        "lastblockhash" : "0x7bd029ebca586693cb22f7260183d309866847957232ef2bea853115a16b057c",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f44154",
                 "code" : "",
@@ -195,10 +209,10 @@
             }
         }
     },
-    "refund_multimpleSuicide_d0g0v0_Frontier" : {
+    "refund_multimpleSuicide_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_multimpleSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -209,19 +223,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x2ae8",
-                    "hash" : "0xcf0a9723534cd0f6431b9a644b564e786e07228f2836dceb5fba90731ea2ec83",
-                    "mixHash" : "0xfa8a6cfebb40c8de9cf1db1b27218d81fa85b16373d498c1e89d0c903afa0848",
-                    "nonce" : "0x59c26bf8875018d9",
+                    "gasUsed" : "0x4104",
+                    "hash" : "0x8a48df0767f5c5a9f24dc611c3c4deab529bfb9430f404a5938a2598e93e92c6",
+                    "mixHash" : "0x21f018eccb4851c56ad2d05a7a14206e485c1323a12d5f8cdf219b6e80393b44",
+                    "nonce" : "0xfbc0749512c2a30a",
                     "number" : "0x01",
                     "parentHash" : "0x26ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4b",
-                    "receiptTrie" : "0xf4098508f7c4707a9fd458f407a31ecb5c1ac6ce14fe04f0fba7dc64faeecefc",
-                    "stateRoot" : "0x03e8f44fa8651d746e93d26218f793fda70e5f0caa7ba1c0e140532aae143701",
+                    "receiptTrie" : "0x34532f100dfed5223409562f738817d86f50cd29fbe3623268cdd90ff1935e94",
+                    "stateRoot" : "0x69a1ef0bbd1465b8898c883c68d085963bd1816592550f04ede94930d531ca8a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f7a026ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003e8f44fa8651d746e93d26218f793fda70e5f0caa7ba1c0e140532aae143701a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a0f4098508f7c4707a9fd458f407a31ecb5c1ac6ce14fe04f0fba7dc64faeecefcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240822ae88203e880a0fa8a6cfebb40c8de9cf1db1b27218d81fa85b16373d498c1e89d0c903afa08488859c26bf8875018d9f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
+                "rlp" : "0xf90263f901f7a026ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069a1ef0bbd1465b8898c883c68d085963bd1816592550f04ede94930d531ca8aa04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a034532f100dfed5223409562f738817d86f50cd29fbe3623268cdd90ff1935e94b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408241048203e880a021f018eccb4851c56ad2d05a7a14206e485c1323a12d5f8cdf219b6e80393b4488fbc0749512c2a30af866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -258,18 +272,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03de4c88ce71baf0bf8c4b23828faf822f30a1b43a22485fb23fea9ca19765f90a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcf0a9723534cd0f6431b9a644b564e786e07228f2836dceb5fba90731ea2ec83",
-        "network" : "Frontier",
+        "lastblockhash" : "0x8a48df0767f5c5a9f24dc611c3c4deab529bfb9430f404a5938a2598e93e92c6",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f42ae8",
+                "balance" : "0x4563918244f44104",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0468f8",
+                "balance" : "0x0452dc",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -293,10 +307,10 @@
             }
         }
     },
-    "refund_multimpleSuicide_d0g0v0_Homestead" : {
+    "refund_multimpleSuicide_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_multimpleSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -307,19 +321,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x2ae8",
-                    "hash" : "0xaaa1e27a3dcc5d7380a99ac2eee3e02e32109a60b82825abf7a0a9bc95914c6b",
-                    "mixHash" : "0xa950b4480a2e7f2dc4cac08e4f3c03cbfe2c37ac716b75d475a04b7d09dcd5d9",
-                    "nonce" : "0x3f134c1c3c056503",
+                    "gasUsed" : "0x4154",
+                    "hash" : "0x6542c438e221e87d944a32675f26e51f44a7705e4cae53ba8ad699c4cbbe6cab",
+                    "mixHash" : "0x5710e4029e0632df06a35fc2407a189e93c693af76a6faeb22c080c1b409e8be",
+                    "nonce" : "0x9880d7a69e095639",
                     "number" : "0x01",
                     "parentHash" : "0x26ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4b",
-                    "receiptTrie" : "0xf4098508f7c4707a9fd458f407a31ecb5c1ac6ce14fe04f0fba7dc64faeecefc",
-                    "stateRoot" : "0x03e8f44fa8651d746e93d26218f793fda70e5f0caa7ba1c0e140532aae143701",
+                    "receiptTrie" : "0x85b54e85e29864066a2bb39857fa3a2cc132361f160c4ef51c3058a3d049809f",
+                    "stateRoot" : "0xb3726515be923f2507e5d41bcf3fc3e0c9814037da6849c20c54e5a977f43910",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f7a026ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003e8f44fa8651d746e93d26218f793fda70e5f0caa7ba1c0e140532aae143701a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a0f4098508f7c4707a9fd458f407a31ecb5c1ac6ce14fe04f0fba7dc64faeecefcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240822ae88203e880a0a950b4480a2e7f2dc4cac08e4f3c03cbfe2c37ac716b75d475a04b7d09dcd5d9883f134c1c3c056503f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
+                "rlp" : "0xf90263f901f7a026ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3726515be923f2507e5d41bcf3fc3e0c9814037da6849c20c54e5a977f43910a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a085b54e85e29864066a2bb39857fa3a2cc132361f160c4ef51c3058a3d049809fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408241548203e880a05710e4029e0632df06a35fc2407a189e93c693af76a6faeb22c080c1b409e8be889880d7a69e095639f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -356,18 +370,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03de4c88ce71baf0bf8c4b23828faf822f30a1b43a22485fb23fea9ca19765f90a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaaa1e27a3dcc5d7380a99ac2eee3e02e32109a60b82825abf7a0a9bc95914c6b",
-        "network" : "Homestead",
+        "lastblockhash" : "0x6542c438e221e87d944a32675f26e51f44a7705e4cae53ba8ad699c4cbbe6cab",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f42ae8",
+                "balance" : "0x4563918244f44154",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0468f8",
+                "balance" : "0x04528c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -391,10 +405,10 @@
             }
         }
     },
-    "refund_multimpleSuicide_d0g0v0_Metropolis" : {
+    "refund_multimpleSuicide_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_multimpleSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -405,19 +419,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x4154",
-                    "hash" : "0x3fb94427feb6cf92cfe1453cc953cfc01b0a523fd807e9f5ba3af58d5218cddc",
-                    "mixHash" : "0x51b1562c47ed662dec16f052d5b03a9301e49482c6a63033445dfe1d6a17b8a1",
-                    "nonce" : "0x3d8a0bf7bd4c5eec",
+                    "gasUsed" : "0x2ae8",
+                    "hash" : "0xd0ad5a511018e5fa8d36fb8bb110e50e4057eb9e8dcd428aa683d41f5da80e84",
+                    "mixHash" : "0xa8d4bc151702a598d216a98eb7bfff27c216450bc1dda8c5cf69d1002008a6ab",
+                    "nonce" : "0x6a04b4be9ecc2961",
                     "number" : "0x01",
                     "parentHash" : "0x26ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4b",
-                    "receiptTrie" : "0x2ab355f6ada4631292453b5e8b436026295531df25a4ca97b2b94d31c34d0c3c",
-                    "stateRoot" : "0xd469f4f0636ac70d7c3d3cdbefbfbd4db732a0607aec822a1a69c8e877647242",
+                    "receiptTrie" : "0xf4098508f7c4707a9fd458f407a31ecb5c1ac6ce14fe04f0fba7dc64faeecefc",
+                    "stateRoot" : "0x03e8f44fa8651d746e93d26218f793fda70e5f0caa7ba1c0e140532aae143701",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f7a026ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d469f4f0636ac70d7c3d3cdbefbfbd4db732a0607aec822a1a69c8e877647242a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a02ab355f6ada4631292453b5e8b436026295531df25a4ca97b2b94d31c34d0c3cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408241548203e880a051b1562c47ed662dec16f052d5b03a9301e49482c6a63033445dfe1d6a17b8a1883d8a0bf7bd4c5eecf866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
+                "rlp" : "0xf90263f901f7a026ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003e8f44fa8651d746e93d26218f793fda70e5f0caa7ba1c0e140532aae143701a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a0f4098508f7c4707a9fd458f407a31ecb5c1ac6ce14fe04f0fba7dc64faeecefcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240822ae88203e880a0a8d4bc151702a598d216a98eb7bfff27c216450bc1dda8c5cf69d1002008a6ab886a04b4be9ecc2961f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -454,25 +468,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03de4c88ce71baf0bf8c4b23828faf822f30a1b43a22485fb23fea9ca19765f90a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3fb94427feb6cf92cfe1453cc953cfc01b0a523fd807e9f5ba3af58d5218cddc",
-        "network" : "Metropolis",
+        "lastblockhash" : "0xd0ad5a511018e5fa8d36fb8bb110e50e4057eb9e8dcd428aa683d41f5da80e84",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f42ae8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0468f8",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x606060405260e060020a600035046309e587a58114610031578063c04062261461004d578063dd4f1f2a1461005a575b005b61002f3373ffffffffffffffffffffffffffffffffffffffff16ff5b6100f5600061010961005e565b61002f5b60003090508073ffffffffffffffffffffffffffffffffffffffff166309e587a56040518160e060020a0281526004018090506000604051808303816000876161da5a03f1156100025750604080517f09e587a500000000000000000000000000000000000000000000000000000000815290516004828101926000929190829003018183876161da5a03f1156100025750505050565b604080519115158252519081900360200190f35b5060019056",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0493e0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "refund_multimpleSuicide_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_multimpleSuicide_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x2ae8",
+                    "hash" : "0xa9bd88d74dc111a676bfbea9461ad0a6a3b1f74ebedb449e79586bae85043a93",
+                    "mixHash" : "0x8f4fe6317ccdbc07acde5beebaa09fa027306b58266d47d8e2bbfc343163ba86",
+                    "nonce" : "0xfa2d87e76003c589",
+                    "number" : "0x01",
+                    "parentHash" : "0x26ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4b",
+                    "receiptTrie" : "0xf4098508f7c4707a9fd458f407a31ecb5c1ac6ce14fe04f0fba7dc64faeecefc",
+                    "stateRoot" : "0x03e8f44fa8651d746e93d26218f793fda70e5f0caa7ba1c0e140532aae143701",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f7a026ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003e8f44fa8651d746e93d26218f793fda70e5f0caa7ba1c0e140532aae143701a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a0f4098508f7c4707a9fd458f407a31ecb5c1ac6ce14fe04f0fba7dc64faeecefcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240822ae88203e880a08f4fe6317ccdbc07acde5beebaa09fa027306b58266d47d8e2bbfc343163ba8688fa2d87e76003c589f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x0493e0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525",
+                        "s" : "0x2fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40f",
+                        "to" : "0x1000000000000000000000000000000000000001",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x26ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4b",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x3de4c88ce71baf0bf8c4b23828faf822f30a1b43a22485fb23fea9ca19765f90",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03de4c88ce71baf0bf8c4b23828faf822f30a1b43a22485fb23fea9ca19765f90a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa9bd88d74dc111a676bfbea9461ad0a6a3b1f74ebedb449e79586bae85043a93",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f44154",
+                "balance" : "0x4563918244f42ae8",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x04528c",
+                "balance" : "0x0468f8",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_singleSuicide_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_singleSuicide_d0g0v0.json
index fa215245e..b6d2eddd4 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_singleSuicide_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_singleSuicide_d0g0v0.json
@@ -1,8 +1,8 @@
 {
-    "refund_singleSuicide_d0g0v0_EIP150" : {
+    "refund_singleSuicide_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_singleSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x358f",
-                    "hash" : "0xcdefa85e678d8264f8fa8e87555d09b14ed549b7fe5572f3b0d80232f0a2f356",
-                    "mixHash" : "0x477158a0cdae6c3b7d0fa97313bfc3b369cb91c4111e98d64476035191b71103",
-                    "nonce" : "0x3bad6c565286879f",
+                    "gasUsed" : "0x35cb",
+                    "hash" : "0x2988711a2149893369cdd71095e4a402355273f711cfc947e5060759acaebdaa",
+                    "mixHash" : "0x804a6b2e3d0b55239eb399beab7b3768e1d291e3dda52ef3f86e45992c7dba81",
+                    "nonce" : "0xdb2a7c048666ed3b",
                     "number" : "0x01",
                     "parentHash" : "0x76de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6",
-                    "receiptTrie" : "0x1821d869b7e7de8f7cb25fd3abc8b949bd7f2dffeef110c06a15b80acdb6eaec",
-                    "stateRoot" : "0xf1a7844373e7b09b53f335f8b03a9a7cedeaf97e36c227d3b32b8439800d2881",
+                    "receiptTrie" : "0x9d09fca691e64e3756bc90fe3c5cfa4a19b52d6265c47e5aaf4e642534897e39",
+                    "stateRoot" : "0x5f1b9e33699ead3ab7c7b64847ebbcd1a01916b69f6d04a6e75e7cb8afe9bf2a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f7a076de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f1a7844373e7b09b53f335f8b03a9a7cedeaf97e36c227d3b32b8439800d2881a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a01821d869b7e7de8f7cb25fd3abc8b949bd7f2dffeef110c06a15b80acdb6eaecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082358f8203e880a0477158a0cdae6c3b7d0fa97313bfc3b369cb91c4111e98d64476035191b71103883bad6c565286879ff866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
+                "rlp" : "0xf90263f901f7a076de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05f1b9e33699ead3ab7c7b64847ebbcd1a01916b69f6d04a6e75e7cb8afe9bf2aa04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a09d09fca691e64e3756bc90fe3c5cfa4a19b52d6265c47e5aaf4e642534897e39b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408235cb8203e880a0804a6b2e3d0b55239eb399beab7b3768e1d291e3dda52ef3f86e45992c7dba8188db2a7c048666ed3bf866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,18 +62,25 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a38e179095b269154c1776ef395730c69e81ff6e8df7fb6b70abeaa7ccc0fec8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcdefa85e678d8264f8fa8e87555d09b14ed549b7fe5572f3b0d80232f0a2f356",
-        "network" : "EIP150",
+        "lastblockhash" : "0x2988711a2149893369cdd71095e4a402355273f711cfc947e5060759acaebdaa",
+        "network" : "Byzantium",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4358f",
+                "balance" : "0x4563918244f435cb",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x045e51",
+                "balance" : "0x045e15",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -97,10 +104,10 @@
             }
         }
     },
-    "refund_singleSuicide_d0g0v0_EIP158" : {
+    "refund_singleSuicide_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/stRefundTest/refund_singleSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -112,18 +119,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x35cb",
-                    "hash" : "0x34e71f67e926fa1812d42f3bd86c332821c8bb0669286669070a367142ef98b8",
-                    "mixHash" : "0x2b0f719565313d918026a07eabbd948aab0def57da366c8cfa5c48d0127646ed",
-                    "nonce" : "0x0e939c788b4298a8",
+                    "hash" : "0xcb10db499dccc4ba66afb010db2165c096b0a9c569ed2baa79d406154300d2ed",
+                    "mixHash" : "0x0d085f758d0f6b555a118d973587311d0a4babff4f00d7f25cdd7ae9b5babc5d",
+                    "nonce" : "0x243f5e36f9f484f2",
                     "number" : "0x01",
                     "parentHash" : "0x76de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6",
-                    "receiptTrie" : "0xb6c21749c74666782f64e7b6e00d569d47da210542d3923dc12c2b151b165794",
-                    "stateRoot" : "0xf0de83259b3b8cb2a2ff8ed13ad54d2a7fda20fa09cba60dc95e4b2784df0bb8",
+                    "receiptTrie" : "0x9d09fca691e64e3756bc90fe3c5cfa4a19b52d6265c47e5aaf4e642534897e39",
+                    "stateRoot" : "0x5f1b9e33699ead3ab7c7b64847ebbcd1a01916b69f6d04a6e75e7cb8afe9bf2a",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f7a076de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f0de83259b3b8cb2a2ff8ed13ad54d2a7fda20fa09cba60dc95e4b2784df0bb8a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a0b6c21749c74666782f64e7b6e00d569d47da210542d3923dc12c2b151b165794b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408235cb8203e880a02b0f719565313d918026a07eabbd948aab0def57da366c8cfa5c48d0127646ed880e939c788b4298a8f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
+                "rlp" : "0xf90263f901f7a076de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05f1b9e33699ead3ab7c7b64847ebbcd1a01916b69f6d04a6e75e7cb8afe9bf2aa04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a09d09fca691e64e3756bc90fe3c5cfa4a19b52d6265c47e5aaf4e642534897e39b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408235cb8203e880a00d085f758d0f6b555a118d973587311d0a4babff4f00d7f25cdd7ae9b5babc5d88243f5e36f9f484f2f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -160,9 +167,16 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a38e179095b269154c1776ef395730c69e81ff6e8df7fb6b70abeaa7ccc0fec8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x34e71f67e926fa1812d42f3bd86c332821c8bb0669286669070a367142ef98b8",
-        "network" : "EIP158",
+        "lastblockhash" : "0xcb10db499dccc4ba66afb010db2165c096b0a9c569ed2baa79d406154300d2ed",
+        "network" : "Constantinople",
         "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f435cb",
                 "code" : "",
@@ -195,10 +209,10 @@
             }
         }
     },
-    "refund_singleSuicide_d0g0v0_Frontier" : {
+    "refund_singleSuicide_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_singleSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -209,19 +223,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x2a81",
-                    "hash" : "0x776f6091df9ff5f505b75bad155b3140071adfc060572d0d3c69072cad73afb8",
-                    "mixHash" : "0x0d23c073291220fbedd449d3468f012a3367561cfe1a8493e6944c7706717eb0",
-                    "nonce" : "0x97403926ac090a74",
+                    "gasUsed" : "0x358f",
+                    "hash" : "0xc612d4e2199906c35d36cde82b12d5e44a34d2d5d5817af1f36b7fb53209a314",
+                    "mixHash" : "0xca29b649bf42b58c8fbe29486c34f3e96f1b2d6bf9008cf2077f8806ea2d4bfe",
+                    "nonce" : "0xe4f2d1d2344c0b0e",
                     "number" : "0x01",
                     "parentHash" : "0x76de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6",
-                    "receiptTrie" : "0x2ef05f56cb6db36f6426768e02e4ed9812880858d64f471899b0308b2147ae57",
-                    "stateRoot" : "0x6120595fc89b40c3c2fadcf63058de93cbd83dca0fbc053bf1b8137d84ec932f",
+                    "receiptTrie" : "0x1821d869b7e7de8f7cb25fd3abc8b949bd7f2dffeef110c06a15b80acdb6eaec",
+                    "stateRoot" : "0xf1a7844373e7b09b53f335f8b03a9a7cedeaf97e36c227d3b32b8439800d2881",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f7a076de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06120595fc89b40c3c2fadcf63058de93cbd83dca0fbc053bf1b8137d84ec932fa04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a02ef05f56cb6db36f6426768e02e4ed9812880858d64f471899b0308b2147ae57b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240822a818203e880a00d23c073291220fbedd449d3468f012a3367561cfe1a8493e6944c7706717eb08897403926ac090a74f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
+                "rlp" : "0xf90263f901f7a076de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f1a7844373e7b09b53f335f8b03a9a7cedeaf97e36c227d3b32b8439800d2881a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a01821d869b7e7de8f7cb25fd3abc8b949bd7f2dffeef110c06a15b80acdb6eaecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082358f8203e880a0ca29b649bf42b58c8fbe29486c34f3e96f1b2d6bf9008cf2077f8806ea2d4bfe88e4f2d1d2344c0b0ef866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -258,18 +272,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a38e179095b269154c1776ef395730c69e81ff6e8df7fb6b70abeaa7ccc0fec8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x776f6091df9ff5f505b75bad155b3140071adfc060572d0d3c69072cad73afb8",
-        "network" : "Frontier",
+        "lastblockhash" : "0xc612d4e2199906c35d36cde82b12d5e44a34d2d5d5817af1f36b7fb53209a314",
+        "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f42a81",
+                "balance" : "0x4563918244f4358f",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x04695f",
+                "balance" : "0x045e51",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -293,10 +307,10 @@
             }
         }
     },
-    "refund_singleSuicide_d0g0v0_Homestead" : {
+    "refund_singleSuicide_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_singleSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -307,19 +321,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x2a81",
-                    "hash" : "0xb596b8328242d8b49033f96ec034860f7110e46fa7ea530c39030a0dabaceab1",
-                    "mixHash" : "0x9f4edffe715b92383abf1baeadc02d2855d4e26c2c3a6317ae6b909e7166fdf0",
-                    "nonce" : "0xcf08d85fb968a36e",
+                    "gasUsed" : "0x35cb",
+                    "hash" : "0x06b30ae82bb91af1b4b7905d5873205ade546208113c36d0725c83970783a66a",
+                    "mixHash" : "0xb9c61e06e3e8532b6fc794fdb226cc83c4b31f9975d0848509c25dbe6d06e2ad",
+                    "nonce" : "0x9462b0705c459951",
                     "number" : "0x01",
                     "parentHash" : "0x76de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6",
-                    "receiptTrie" : "0x2ef05f56cb6db36f6426768e02e4ed9812880858d64f471899b0308b2147ae57",
-                    "stateRoot" : "0x6120595fc89b40c3c2fadcf63058de93cbd83dca0fbc053bf1b8137d84ec932f",
+                    "receiptTrie" : "0xb6c21749c74666782f64e7b6e00d569d47da210542d3923dc12c2b151b165794",
+                    "stateRoot" : "0xf0de83259b3b8cb2a2ff8ed13ad54d2a7fda20fa09cba60dc95e4b2784df0bb8",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f7a076de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06120595fc89b40c3c2fadcf63058de93cbd83dca0fbc053bf1b8137d84ec932fa04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a02ef05f56cb6db36f6426768e02e4ed9812880858d64f471899b0308b2147ae57b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240822a818203e880a09f4edffe715b92383abf1baeadc02d2855d4e26c2c3a6317ae6b909e7166fdf088cf08d85fb968a36ef866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
+                "rlp" : "0xf90263f901f7a076de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f0de83259b3b8cb2a2ff8ed13ad54d2a7fda20fa09cba60dc95e4b2784df0bb8a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a0b6c21749c74666782f64e7b6e00d569d47da210542d3923dc12c2b151b165794b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408235cb8203e880a0b9c61e06e3e8532b6fc794fdb226cc83c4b31f9975d0848509c25dbe6d06e2ad889462b0705c459951f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -356,18 +370,18 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a38e179095b269154c1776ef395730c69e81ff6e8df7fb6b70abeaa7ccc0fec8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb596b8328242d8b49033f96ec034860f7110e46fa7ea530c39030a0dabaceab1",
-        "network" : "Homestead",
+        "lastblockhash" : "0x06b30ae82bb91af1b4b7905d5873205ade546208113c36d0725c83970783a66a",
+        "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f42a81",
+                "balance" : "0x4563918244f435cb",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x04695f",
+                "balance" : "0x045e15",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -391,10 +405,10 @@
             }
         }
     },
-    "refund_singleSuicide_d0g0v0_Metropolis" : {
+    "refund_singleSuicide_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_singleSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -405,19 +419,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x35cb",
-                    "hash" : "0xc9daf44d9acc2921a6f74416c7d2e197cf427b2537e92ea5a89dda0135eedf9f",
-                    "mixHash" : "0x91f45e544a08b596d2f1bc8f412ec0f72eaaec9846224f1664c3efade1b721a0",
-                    "nonce" : "0xc17a2a14e4e968ab",
+                    "gasUsed" : "0x2a81",
+                    "hash" : "0x4d75c09bf8c3d88eeafbcabc2ae9b97e9870bc7ced081fb4942e395b02888620",
+                    "mixHash" : "0x0d0817193509451e873a551056dd689f5e2a66281c8c6dc9db2609ae0d523e10",
+                    "nonce" : "0x0029b533135f3474",
                     "number" : "0x01",
                     "parentHash" : "0x76de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6",
-                    "receiptTrie" : "0x9d09fca691e64e3756bc90fe3c5cfa4a19b52d6265c47e5aaf4e642534897e39",
-                    "stateRoot" : "0x5f1b9e33699ead3ab7c7b64847ebbcd1a01916b69f6d04a6e75e7cb8afe9bf2a",
+                    "receiptTrie" : "0x2ef05f56cb6db36f6426768e02e4ed9812880858d64f471899b0308b2147ae57",
+                    "stateRoot" : "0x6120595fc89b40c3c2fadcf63058de93cbd83dca0fbc053bf1b8137d84ec932f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f7a076de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05f1b9e33699ead3ab7c7b64847ebbcd1a01916b69f6d04a6e75e7cb8afe9bf2aa04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a09d09fca691e64e3756bc90fe3c5cfa4a19b52d6265c47e5aaf4e642534897e39b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408235cb8203e880a091f45e544a08b596d2f1bc8f412ec0f72eaaec9846224f1664c3efade1b721a088c17a2a14e4e968abf866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
+                "rlp" : "0xf90263f901f7a076de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06120595fc89b40c3c2fadcf63058de93cbd83dca0fbc053bf1b8137d84ec932fa04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a02ef05f56cb6db36f6426768e02e4ed9812880858d64f471899b0308b2147ae57b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240822a818203e880a00d0817193509451e873a551056dd689f5e2a66281c8c6dc9db2609ae0d523e10880029b533135f3474f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -454,25 +468,116 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a38e179095b269154c1776ef395730c69e81ff6e8df7fb6b70abeaa7ccc0fec8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc9daf44d9acc2921a6f74416c7d2e197cf427b2537e92ea5a89dda0135eedf9f",
-        "network" : "Metropolis",
+        "lastblockhash" : "0x4d75c09bf8c3d88eeafbcabc2ae9b97e9870bc7ced081fb4942e395b02888620",
+        "network" : "Frontier",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f42a81",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x04695f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x606060405260e060020a600035046309e587a58114602e5780632e4699ed146049578063c040622614609b575b005b602c3373ffffffffffffffffffffffffffffffffffffffff16ff5b602c5b60003090508073ffffffffffffffffffffffffffffffffffffffff166309e587a56040518160e060020a0281526004018090506000604051808303816000876161da5a03f11560025750505050565b60a5600060b9604c565b604080519115158252519081900360200190f35b5060019056",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0493e0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "refund_singleSuicide_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_singleSuicide_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x0f4240",
+                    "gasUsed" : "0x2a81",
+                    "hash" : "0x02a73207447b42e3b979e5f91f3f32cdd7b1017900f5b5e71bd258c046db73f4",
+                    "mixHash" : "0x957a459d753965b6e7cb1bc462981cfb947d0f6b75c4fe12657f4b8b4374174f",
+                    "nonce" : "0xb2ae88336104e297",
+                    "number" : "0x01",
+                    "parentHash" : "0x76de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6",
+                    "receiptTrie" : "0x2ef05f56cb6db36f6426768e02e4ed9812880858d64f471899b0308b2147ae57",
+                    "stateRoot" : "0x6120595fc89b40c3c2fadcf63058de93cbd83dca0fbc053bf1b8137d84ec932f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x4f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90263f901f7a076de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06120595fc89b40c3c2fadcf63058de93cbd83dca0fbc053bf1b8137d84ec932fa04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a02ef05f56cb6db36f6426768e02e4ed9812880858d64f471899b0308b2147ae57b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240822a818203e880a0957a459d753965b6e7cb1bc462981cfb947d0f6b75c4fe12657f4b8b4374174f88b2ae88336104e297f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
+                "transactions" : [
+                    {
+                        "data" : "0xc0406226",
+                        "gasLimit" : "0x0493e0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x6c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525",
+                        "s" : "0x2fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40f",
+                        "to" : "0x1000000000000000000000000000000000000001",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x0f4240",
+            "gasUsed" : "0x00",
+            "hash" : "0x76de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa38e179095b269154c1776ef395730c69e81ff6e8df7fb6b70abeaa7ccc0fec8",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a38e179095b269154c1776ef395730c69e81ff6e8df7fb6b70abeaa7ccc0fec8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x02a73207447b42e3b979e5f91f3f32cdd7b1017900f5b5e71bd258c046db73f4",
+        "network" : "Homestead",
+        "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f435cb",
+                "balance" : "0x4563918244f42a81",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x045e15",
+                "balance" : "0x04695f",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {