Translate GeneralStateTests into BlockahtinTests/GeneralStateTests

24 files changed, 1084 insertions, 1252 deletions

diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund50_1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund50_1_d0g0v0.json
index 746b5fd62..4f619e18b 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund50_1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund50_1_d0g0v0.json
@@ -2,7 +2,7 @@
     "refund50_1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x59e7",
-                    "hash" : "0xdec6e4e2b651b6ad30a1989967ea1225f05087979f700fc103a172c6d78965e8",
-                    "mixHash" : "0xd18e7ba508377dd51891f3beb04b882ba29e340886bdfc399b8f036017748632",
-                    "nonce" : "0x5c370e4dd1ca7f9f",
+                    "hash" : "0x31a922db651e34f1016498af888b06e28216bec1a16c9b655f63ae9c93fa65a4",
+                    "mixHash" : "0x6c0fc5370a2b9ebd22c65ed59f6c3872e67bf968ec0be76ab8c702d8a35b2ea0",
+                    "nonce" : "0x421d1a6f9b5deaa5",
                     "number" : "0x01",
                     "parentHash" : "0x44d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0",
                     "receiptTrie" : "0x6c8ab36ec0629c97734e8ac823cdd8397de67efb76c7beb983be73dcd3c78141",
-                    "stateRoot" : "0x502a1b0a5a3920a24d205876621de3ddb424e65dd626a7b2e427fe1dbf434671",
+                    "stateRoot" : "0x03224c47d714ee22235e5ff1ebb8a865914017aca9ade32d69923edb1c66174f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a044d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0502a1b0a5a3920a24d205876621de3ddb424e65dd626a7b2e427fe1dbf434671a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a06c8ab36ec0629c97734e8ac823cdd8397de67efb76c7beb983be73dcd3c78141b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408259e78203e880a0d18e7ba508377dd51891f3beb04b882ba29e340886bdfc399b8f036017748632885c370e4dd1ca7f9ff862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a044d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003224c47d714ee22235e5ff1ebb8a865914017aca9ade32d69923edb1c66174fa01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a06c8ab36ec0629c97734e8ac823cdd8397de67efb76c7beb983be73dcd3c78141b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408259e78203e880a06c0fc5370a2b9ebd22c65ed59f6c3872e67bf968ec0be76ab8c702d8a35b2ea088421d1a6f9b5deaa5f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aeb02533f639b4a951afda3021b9f1a851d3c2699b18968ab2c8c871670b9c92a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdec6e4e2b651b6ad30a1989967ea1225f05087979f700fc103a172c6d78965e8",
+        "lastblockhash" : "0x31a922db651e34f1016498af888b06e28216bec1a16c9b655f63ae9c93fa65a4",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60006001556000600255600060035560006004556000600555",
@@ -80,7 +73,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f459e7",
+                "balance" : "0x29a2241af62c59e7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -119,7 +112,7 @@
     "refund50_1_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -131,18 +124,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x59e7",
-                    "hash" : "0x9a06e6d0a20eb82117ed2985f21f7f006bd3c8932a33dc23b945b215a23a5d09",
-                    "mixHash" : "0x0956e6f8c0d2549afdc7ee3c5c3bbf7f72587615c0899a966149c06de5c61e94",
-                    "nonce" : "0x7c58bcc1942967b9",
+                    "hash" : "0x82c75d90ac5226c33dbc3013938716d5337bd7b80beac5d550c61c49221bd0b7",
+                    "mixHash" : "0x69c3028d26fdc3358d29ba4f9762a0310c7d9d01ae5eab0f3c2b603cf8273d34",
+                    "nonce" : "0x36a8eb954044ad5e",
                     "number" : "0x01",
                     "parentHash" : "0x44d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0",
                     "receiptTrie" : "0x6c8ab36ec0629c97734e8ac823cdd8397de67efb76c7beb983be73dcd3c78141",
-                    "stateRoot" : "0x502a1b0a5a3920a24d205876621de3ddb424e65dd626a7b2e427fe1dbf434671",
+                    "stateRoot" : "0x50225d6cac71630a306040c1f0610795550a41485998063f18040bba6a00d878",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a044d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0502a1b0a5a3920a24d205876621de3ddb424e65dd626a7b2e427fe1dbf434671a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a06c8ab36ec0629c97734e8ac823cdd8397de67efb76c7beb983be73dcd3c78141b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408259e78203e880a00956e6f8c0d2549afdc7ee3c5c3bbf7f72587615c0899a966149c06de5c61e94887c58bcc1942967b9f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a044d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa050225d6cac71630a306040c1f0610795550a41485998063f18040bba6a00d878a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a06c8ab36ec0629c97734e8ac823cdd8397de67efb76c7beb983be73dcd3c78141b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408259e78203e880a069c3028d26fdc3358d29ba4f9762a0310c7d9d01ae5eab0f3c2b603cf8273d348836a8eb954044ad5ef862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -179,7 +172,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aeb02533f639b4a951afda3021b9f1a851d3c2699b18968ab2c8c871670b9c92a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9a06e6d0a20eb82117ed2985f21f7f006bd3c8932a33dc23b945b215a23a5d09",
+        "lastblockhash" : "0x82c75d90ac5226c33dbc3013938716d5337bd7b80beac5d550c61c49221bd0b7",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -197,7 +190,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f459e7",
+                "balance" : "0x29a2241af62c59e7",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -236,7 +229,7 @@
     "refund50_1_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -248,9 +241,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x59e7",
-                    "hash" : "0x949d6c82a152931e67c3b094fc86f05ee5314a78223e7de9a9da32e87f3a6da1",
-                    "mixHash" : "0x7e214fc689fb46b8c69090e96e830da368fda7c460f1ebe204ab1c3f051f827e",
-                    "nonce" : "0xe7689deef8bba532",
+                    "hash" : "0xcfd037d15a4d19033e239497e2c3bcc2db591f1b5bb1a85c5585a32b0a2069a1",
+                    "mixHash" : "0x8614fb37e4142ccffa5174743e715b583cc19661a60f3d86606c35cd25d10b8b",
+                    "nonce" : "0x2feb38392bc8b00c",
                     "number" : "0x01",
                     "parentHash" : "0x44d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0",
                     "receiptTrie" : "0x570accd13b1cd2f3c3d4a0abd25ddba4d64bb48cfacbd2521d101e4d4d46d5ec",
@@ -259,7 +252,7 @@
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a044d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6d08f38ff2fdd14886e125bfa1979a81eeceb2cb4f78e37fe8ebc9a21c54413a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0570accd13b1cd2f3c3d4a0abd25ddba4d64bb48cfacbd2521d101e4d4d46d5ecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408259e78203e880a07e214fc689fb46b8c69090e96e830da368fda7c460f1ebe204ab1c3f051f827e88e7689deef8bba532f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a044d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6d08f38ff2fdd14886e125bfa1979a81eeceb2cb4f78e37fe8ebc9a21c54413a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0570accd13b1cd2f3c3d4a0abd25ddba4d64bb48cfacbd2521d101e4d4d46d5ecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408259e78203e880a08614fb37e4142ccffa5174743e715b583cc19661a60f3d86606c35cd25d10b8b882feb38392bc8b00cf862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -296,7 +289,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aeb02533f639b4a951afda3021b9f1a851d3c2699b18968ab2c8c871670b9c92a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x949d6c82a152931e67c3b094fc86f05ee5314a78223e7de9a9da32e87f3a6da1",
+        "lastblockhash" : "0xcfd037d15a4d19033e239497e2c3bcc2db591f1b5bb1a85c5585a32b0a2069a1",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -346,7 +339,7 @@
     "refund50_1_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -358,9 +351,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x59e7",
-                    "hash" : "0x0c36f73b3a7a76ed8fcf99f761c44287b3600ae015986a2ad063fed4a7a62cef",
-                    "mixHash" : "0x16501004303c179f291850ae6052e0b137648555759accf611ca305fb3c85dd1",
-                    "nonce" : "0xd3b3310e60c3ca00",
+                    "hash" : "0xd8e347dfd9dc64cec39f6049f51473435d085c12cb9af4ca0ba6f2c6fb77ad33",
+                    "mixHash" : "0x5a649be4d58063121867baa9700791bbe0c8ac79f4d6eaadb45f4779f811b248",
+                    "nonce" : "0x37492ef0293498ac",
                     "number" : "0x01",
                     "parentHash" : "0x44d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0",
                     "receiptTrie" : "0x570accd13b1cd2f3c3d4a0abd25ddba4d64bb48cfacbd2521d101e4d4d46d5ec",
@@ -369,7 +362,7 @@
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a044d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6d08f38ff2fdd14886e125bfa1979a81eeceb2cb4f78e37fe8ebc9a21c54413a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0570accd13b1cd2f3c3d4a0abd25ddba4d64bb48cfacbd2521d101e4d4d46d5ecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408259e78203e880a016501004303c179f291850ae6052e0b137648555759accf611ca305fb3c85dd188d3b3310e60c3ca00f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a044d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6d08f38ff2fdd14886e125bfa1979a81eeceb2cb4f78e37fe8ebc9a21c54413a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0570accd13b1cd2f3c3d4a0abd25ddba4d64bb48cfacbd2521d101e4d4d46d5ecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408259e78203e880a05a649be4d58063121867baa9700791bbe0c8ac79f4d6eaadb45f4779f811b2488837492ef0293498acf862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -406,7 +399,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aeb02533f639b4a951afda3021b9f1a851d3c2699b18968ab2c8c871670b9c92a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0c36f73b3a7a76ed8fcf99f761c44287b3600ae015986a2ad063fed4a7a62cef",
+        "lastblockhash" : "0xd8e347dfd9dc64cec39f6049f51473435d085c12cb9af4ca0ba6f2c6fb77ad33",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -456,7 +449,7 @@
     "refund50_1_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -468,9 +461,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x59e7",
-                    "hash" : "0xaa3031f2932fc04795693236f922d9843a6be261a9ccfadf1c195eae79000ec9",
-                    "mixHash" : "0xe18dca0bded59361528834f3476a6820b9bf0cdea0fe646c5f4327b93cf9ff50",
-                    "nonce" : "0x6c42a203b5a344dd",
+                    "hash" : "0x9cc0bae52649fd4ab3a726e80557c07cd423d52ce862d1267c804380d4f4a0a5",
+                    "mixHash" : "0xddf482922d116579ef2eae57906d177ab7cf0f839548330a150f702d8b0c5efe",
+                    "nonce" : "0xc19aace667af9ecb",
                     "number" : "0x01",
                     "parentHash" : "0x44d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0",
                     "receiptTrie" : "0x570accd13b1cd2f3c3d4a0abd25ddba4d64bb48cfacbd2521d101e4d4d46d5ec",
@@ -479,7 +472,7 @@
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a044d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6d08f38ff2fdd14886e125bfa1979a81eeceb2cb4f78e37fe8ebc9a21c54413a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0570accd13b1cd2f3c3d4a0abd25ddba4d64bb48cfacbd2521d101e4d4d46d5ecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408259e78203e880a0e18dca0bded59361528834f3476a6820b9bf0cdea0fe646c5f4327b93cf9ff50886c42a203b5a344ddf862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a044d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6d08f38ff2fdd14886e125bfa1979a81eeceb2cb4f78e37fe8ebc9a21c54413a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0570accd13b1cd2f3c3d4a0abd25ddba4d64bb48cfacbd2521d101e4d4d46d5ecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408259e78203e880a0ddf482922d116579ef2eae57906d177ab7cf0f839548330a150f702d8b0c5efe88c19aace667af9ecbf862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -516,7 +509,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aeb02533f639b4a951afda3021b9f1a851d3c2699b18968ab2c8c871670b9c92a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaa3031f2932fc04795693236f922d9843a6be261a9ccfadf1c195eae79000ec9",
+        "lastblockhash" : "0x9cc0bae52649fd4ab3a726e80557c07cd423d52ce862d1267c804380d4f4a0a5",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -566,7 +559,7 @@
     "refund50_1_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -578,9 +571,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x59e7",
-                    "hash" : "0x7d1449ad5c0db304af9e0f4f1e17f6d26aa2bf393be2b6531fadae14aa7fc584",
-                    "mixHash" : "0x1312ede07ee0814b7e4274b0f7972bac1e26e6a14a16fbeca86360cd27fe51de",
-                    "nonce" : "0x68fb00815e245ac3",
+                    "hash" : "0x7cea38f816f163e7c26725402139fbdbf7d86173ff4f482785d01eade016b9f5",
+                    "mixHash" : "0xa68b3559f20cebbbed843e5ba23d39e31e9889cfe63e3fb392162a929feeab04",
+                    "nonce" : "0xa80f2cc4eaf4d14f",
                     "number" : "0x01",
                     "parentHash" : "0x44d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0",
                     "receiptTrie" : "0x570accd13b1cd2f3c3d4a0abd25ddba4d64bb48cfacbd2521d101e4d4d46d5ec",
@@ -589,7 +582,7 @@
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a044d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6d08f38ff2fdd14886e125bfa1979a81eeceb2cb4f78e37fe8ebc9a21c54413a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0570accd13b1cd2f3c3d4a0abd25ddba4d64bb48cfacbd2521d101e4d4d46d5ecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408259e78203e880a01312ede07ee0814b7e4274b0f7972bac1e26e6a14a16fbeca86360cd27fe51de8868fb00815e245ac3f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a044d19f16f3501c59a093c2b6544b76e13c84f2ae2f0d64c2a1e5e4a9f851d0c0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6d08f38ff2fdd14886e125bfa1979a81eeceb2cb4f78e37fe8ebc9a21c54413a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0570accd13b1cd2f3c3d4a0abd25ddba4d64bb48cfacbd2521d101e4d4d46d5ecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408259e78203e880a0a68b3559f20cebbbed843e5ba23d39e31e9889cfe63e3fb392162a929feeab0488a80f2cc4eaf4d14ff862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -626,7 +619,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aeb02533f639b4a951afda3021b9f1a851d3c2699b18968ab2c8c871670b9c92a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7d1449ad5c0db304af9e0f4f1e17f6d26aa2bf393be2b6531fadae14aa7fc584",
+        "lastblockhash" : "0x7cea38f816f163e7c26725402139fbdbf7d86173ff4f482785d01eade016b9f5",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund50_2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund50_2_d0g0v0.json
index 178296a5c..e7212ada9 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund50_2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund50_2_d0g0v0.json
@@ -2,7 +2,7 @@
     "refund50_2_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa80d",
-                    "hash" : "0x54f3fb53619f5a54375fcdc9d94f8a98a01b0336e03ebfdc00f58fd93cdf806f",
-                    "mixHash" : "0x221680ba24c140c1cf36e9557ea8a2c4354b60e2c9b0fd00fd1c103b07447695",
-                    "nonce" : "0x2a359579a4fcaa99",
+                    "hash" : "0xd36cfaf1a3874577ec6e7c9b2d8e48bbe9016250d885f8da07a46c4b07f0f3c5",
+                    "mixHash" : "0xee72e1eb40d7799a86d7a7fcd227f9345b77b21f142597b8f9750ee614e4750d",
+                    "nonce" : "0x17be03c684d76742",
                     "number" : "0x01",
                     "parentHash" : "0xfefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7",
                     "receiptTrie" : "0x033163e6c3a8ffa81888536ada16cb63c2d93fc04ab21edc3d7587bce88a54f9",
-                    "stateRoot" : "0x7f813027daae4ddb07adacaac676e728d9031b056b5ac0f86214ad00038c0138",
+                    "stateRoot" : "0xac20cf28eeb0d50b648e66b667d6368972db225523a3c1500ed66b818735700d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0fefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f813027daae4ddb07adacaac676e728d9031b056b5ac0f86214ad00038c0138a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0033163e6c3a8ffa81888536ada16cb63c2d93fc04ab21edc3d7587bce88a54f9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a80d8203e880a0221680ba24c140c1cf36e9557ea8a2c4354b60e2c9b0fd00fd1c103b07447695882a359579a4fcaa99f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0fefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac20cf28eeb0d50b648e66b667d6368972db225523a3c1500ed66b818735700da01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0033163e6c3a8ffa81888536ada16cb63c2d93fc04ab21edc3d7587bce88a54f9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a80d8203e880a0ee72e1eb40d7799a86d7a7fcd227f9345b77b21f142597b8f9750ee614e4750d8817be03c684d76742f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0998c638ddb986ce51957e3164668df171d4cf543c0f5e5d4e7dd938aa17ef31da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x54f3fb53619f5a54375fcdc9d94f8a98a01b0336e03ebfdc00f58fd93cdf806f",
+        "lastblockhash" : "0xd36cfaf1a3874577ec6e7c9b2d8e48bbe9016250d885f8da07a46c4b07f0f3c5",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6001600a556001600b5560006001556000600255600060035560006004556000600555",
@@ -82,7 +75,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a80d",
+                "balance" : "0x29a2241af62ca80d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -121,7 +114,7 @@
     "refund50_2_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -133,18 +126,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa80d",
-                    "hash" : "0xa1a44bb93dfee71db76a348d19719b0d46e1b6510e0af57ff6fa015288a1f2d6",
-                    "mixHash" : "0xb53707ff7bf6f4234c2ddbd722455ca29a447498f3ae13831054acd6b2754de4",
-                    "nonce" : "0x44b0eab3892197d9",
+                    "hash" : "0x882bcf84cd33bcbfd5b58e341bef1f0d54723c89f22b7c5dc59895f6591c40e9",
+                    "mixHash" : "0x4383681c6e07e2e1d03272f3e87b669056aa9ecd4536a8be70763328ea9d7fa4",
+                    "nonce" : "0x1c2de21cb9f89b55",
                     "number" : "0x01",
                     "parentHash" : "0xfefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7",
                     "receiptTrie" : "0x033163e6c3a8ffa81888536ada16cb63c2d93fc04ab21edc3d7587bce88a54f9",
-                    "stateRoot" : "0x7f813027daae4ddb07adacaac676e728d9031b056b5ac0f86214ad00038c0138",
+                    "stateRoot" : "0xbd1995c329d60ce5f7501f340437fa4c0bc30df4a6cfe2765b23e3b25767f511",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0fefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07f813027daae4ddb07adacaac676e728d9031b056b5ac0f86214ad00038c0138a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0033163e6c3a8ffa81888536ada16cb63c2d93fc04ab21edc3d7587bce88a54f9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a80d8203e880a0b53707ff7bf6f4234c2ddbd722455ca29a447498f3ae13831054acd6b2754de48844b0eab3892197d9f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0fefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd1995c329d60ce5f7501f340437fa4c0bc30df4a6cfe2765b23e3b25767f511a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0033163e6c3a8ffa81888536ada16cb63c2d93fc04ab21edc3d7587bce88a54f9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a80d8203e880a04383681c6e07e2e1d03272f3e87b669056aa9ecd4536a8be70763328ea9d7fa4881c2de21cb9f89b55f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -181,7 +174,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0998c638ddb986ce51957e3164668df171d4cf543c0f5e5d4e7dd938aa17ef31da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa1a44bb93dfee71db76a348d19719b0d46e1b6510e0af57ff6fa015288a1f2d6",
+        "lastblockhash" : "0x882bcf84cd33bcbfd5b58e341bef1f0d54723c89f22b7c5dc59895f6591c40e9",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -201,7 +194,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a80d",
+                "balance" : "0x29a2241af62ca80d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -240,7 +233,7 @@
     "refund50_2_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -252,9 +245,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa80d",
-                    "hash" : "0x721be345e51241102acffc35ac3809857615fe64d95f3014bfec9ce5cafa5cd8",
-                    "mixHash" : "0x934929110052abb143aba5c90c16190d9929acca685347e7fa54b12746576f54",
-                    "nonce" : "0x64a052dac0f70e70",
+                    "hash" : "0x92171c73bd7bdf23f346930f61c965ff9b33176dba95ace6a17611226ad3e371",
+                    "mixHash" : "0x96e1b365b327fbab10d7dffe0d2acef80a6f0fd7e89264ae67dde35fba9396bd",
+                    "nonce" : "0xed624857fc0dbe77",
                     "number" : "0x01",
                     "parentHash" : "0xfefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7",
                     "receiptTrie" : "0x21f30d3b7761a302dbb167f49c308c40f21e7adff9efe21c2878e98fd037ac15",
@@ -263,7 +256,7 @@
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0fefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa48cde6895623857de5fb9875806f493d3a62d70251225b4f010087f4aecc57a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a021f30d3b7761a302dbb167f49c308c40f21e7adff9efe21c2878e98fd037ac15b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a80d8203e880a0934929110052abb143aba5c90c16190d9929acca685347e7fa54b12746576f548864a052dac0f70e70f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0fefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa48cde6895623857de5fb9875806f493d3a62d70251225b4f010087f4aecc57a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a021f30d3b7761a302dbb167f49c308c40f21e7adff9efe21c2878e98fd037ac15b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a80d8203e880a096e1b365b327fbab10d7dffe0d2acef80a6f0fd7e89264ae67dde35fba9396bd88ed624857fc0dbe77f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -300,7 +293,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0998c638ddb986ce51957e3164668df171d4cf543c0f5e5d4e7dd938aa17ef31da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x721be345e51241102acffc35ac3809857615fe64d95f3014bfec9ce5cafa5cd8",
+        "lastblockhash" : "0x92171c73bd7bdf23f346930f61c965ff9b33176dba95ace6a17611226ad3e371",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -352,7 +345,7 @@
     "refund50_2_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -364,9 +357,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa80d",
-                    "hash" : "0x4a038564b00affa4d154fe3b627e784d2358741d553ccb6b760f69de1aed441a",
-                    "mixHash" : "0xba599f0dfb7a72772bff92654f400460f5fc61ee3b54f0e904cbd859376d98ff",
-                    "nonce" : "0xe9c829c346952b9b",
+                    "hash" : "0xee71eac688e46fd04835ea0faf7197f7e22b9a6c9d9770778bd0031b7b875628",
+                    "mixHash" : "0x6382f2cc62fb48931390689388c1ba5002f5fb37ce0153793984dbb232f0151b",
+                    "nonce" : "0x01ba4a561a3dbddf",
                     "number" : "0x01",
                     "parentHash" : "0xfefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7",
                     "receiptTrie" : "0x21f30d3b7761a302dbb167f49c308c40f21e7adff9efe21c2878e98fd037ac15",
@@ -375,7 +368,7 @@
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0fefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa48cde6895623857de5fb9875806f493d3a62d70251225b4f010087f4aecc57a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a021f30d3b7761a302dbb167f49c308c40f21e7adff9efe21c2878e98fd037ac15b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a80d8203e880a0ba599f0dfb7a72772bff92654f400460f5fc61ee3b54f0e904cbd859376d98ff88e9c829c346952b9bf862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0fefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa48cde6895623857de5fb9875806f493d3a62d70251225b4f010087f4aecc57a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a021f30d3b7761a302dbb167f49c308c40f21e7adff9efe21c2878e98fd037ac15b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a80d8203e880a06382f2cc62fb48931390689388c1ba5002f5fb37ce0153793984dbb232f0151b8801ba4a561a3dbddff862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -412,7 +405,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0998c638ddb986ce51957e3164668df171d4cf543c0f5e5d4e7dd938aa17ef31da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4a038564b00affa4d154fe3b627e784d2358741d553ccb6b760f69de1aed441a",
+        "lastblockhash" : "0xee71eac688e46fd04835ea0faf7197f7e22b9a6c9d9770778bd0031b7b875628",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -464,7 +457,7 @@
     "refund50_2_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -476,9 +469,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa80d",
-                    "hash" : "0xfcea7f1551911d30a7ea4f2f77486a41a9447b0b03c98022adad9384ebae4874",
-                    "mixHash" : "0xbfcb886e629cbf85ef52f7a25bfee2f69648d7de190dfbcaf083c3030149566e",
-                    "nonce" : "0xf12353f31a87d61d",
+                    "hash" : "0x09547f675720b19d092f4126bce53e3c0f45d8389743735414e3716548d4a79e",
+                    "mixHash" : "0xa976d22eb763ed2e3e42900ac89a657789b0f3842602677550d12d6a51facd9b",
+                    "nonce" : "0x77454826858d9c46",
                     "number" : "0x01",
                     "parentHash" : "0xfefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7",
                     "receiptTrie" : "0x21f30d3b7761a302dbb167f49c308c40f21e7adff9efe21c2878e98fd037ac15",
@@ -487,7 +480,7 @@
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0fefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa48cde6895623857de5fb9875806f493d3a62d70251225b4f010087f4aecc57a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a021f30d3b7761a302dbb167f49c308c40f21e7adff9efe21c2878e98fd037ac15b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a80d8203e880a0bfcb886e629cbf85ef52f7a25bfee2f69648d7de190dfbcaf083c3030149566e88f12353f31a87d61df862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0fefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa48cde6895623857de5fb9875806f493d3a62d70251225b4f010087f4aecc57a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a021f30d3b7761a302dbb167f49c308c40f21e7adff9efe21c2878e98fd037ac15b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a80d8203e880a0a976d22eb763ed2e3e42900ac89a657789b0f3842602677550d12d6a51facd9b8877454826858d9c46f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -524,7 +517,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0998c638ddb986ce51957e3164668df171d4cf543c0f5e5d4e7dd938aa17ef31da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfcea7f1551911d30a7ea4f2f77486a41a9447b0b03c98022adad9384ebae4874",
+        "lastblockhash" : "0x09547f675720b19d092f4126bce53e3c0f45d8389743735414e3716548d4a79e",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -576,7 +569,7 @@
     "refund50_2_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50_2_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -588,9 +581,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa80d",
-                    "hash" : "0x1994d560a61875ffe71c205398a53b38fca93eabf5a8d3fd2dede33c3579ef21",
-                    "mixHash" : "0x3e5a23b852621ffd86a17ee90777184664576baf11ccb58c41b4dbf1fe2cd0ac",
-                    "nonce" : "0x39b50351ef64c14c",
+                    "hash" : "0x85cce42874e29c20d71caa138f4d947a24e021b92d57533d6eee286dd1b1f696",
+                    "mixHash" : "0xb0903b58fb50115cd6c77e3a9eaaaca050a0d6ba304fa597ff2d347e8f161559",
+                    "nonce" : "0xb01f38956de3f9d0",
                     "number" : "0x01",
                     "parentHash" : "0xfefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7",
                     "receiptTrie" : "0x21f30d3b7761a302dbb167f49c308c40f21e7adff9efe21c2878e98fd037ac15",
@@ -599,7 +592,7 @@
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0fefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa48cde6895623857de5fb9875806f493d3a62d70251225b4f010087f4aecc57a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a021f30d3b7761a302dbb167f49c308c40f21e7adff9efe21c2878e98fd037ac15b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a80d8203e880a03e5a23b852621ffd86a17ee90777184664576baf11ccb58c41b4dbf1fe2cd0ac8839b50351ef64c14cf862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0fefb16759225c7c0402986ead079ac1cc06b1a09c3b607e76a236cdf679787e7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa48cde6895623857de5fb9875806f493d3a62d70251225b4f010087f4aecc57a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a021f30d3b7761a302dbb167f49c308c40f21e7adff9efe21c2878e98fd037ac15b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a80d8203e880a0b0903b58fb50115cd6c77e3a9eaaaca050a0d6ba304fa597ff2d347e8f16155988b01f38956de3f9d0f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -636,7 +629,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0998c638ddb986ce51957e3164668df171d4cf543c0f5e5d4e7dd938aa17ef31da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1994d560a61875ffe71c205398a53b38fca93eabf5a8d3fd2dede33c3579ef21",
+        "lastblockhash" : "0x85cce42874e29c20d71caa138f4d947a24e021b92d57533d6eee286dd1b1f696",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund50percentCap_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund50percentCap_d0g0v0.json
index 02603ddea..6bd853137 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund50percentCap_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund50percentCap_d0g0v0.json
@@ -2,7 +2,7 @@
     "refund50percentCap_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50percentCap_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb2bb",
-                    "hash" : "0xdbf932ced2541aae0f182668475799d2b02443e71f7b08b8ad9a38259ed30564",
-                    "mixHash" : "0x6b52228847790a4257c8df5bd8c9a4edec9abcc1edbe1b35ed085440d4198a55",
-                    "nonce" : "0xa634d394ca36ea68",
+                    "gasUsed" : "0xb388",
+                    "hash" : "0x5a9d3497e7eb878e737e015cebf5074c41501c1240ce70fe4e3ebc43be7383a4",
+                    "mixHash" : "0x6583d6387dd5c581a5f5c235090e195e536639b368d537583ae7977757203682",
+                    "nonce" : "0x3ff7a98a32dea310",
                     "number" : "0x01",
-                    "parentHash" : "0xbbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1",
-                    "receiptTrie" : "0xb38a8503ca34336efb7f39c6f21c270ba2559492d933aad99e09bc0870628de1",
-                    "stateRoot" : "0xed00b4dcfea14503f89ad98f059f059f8232d0273006a4a546a0985a92979b4b",
+                    "parentHash" : "0x668fb85814b8117f2deae45f5a783cd106f9b0652c1e81d551102e93d55e2d26",
+                    "receiptTrie" : "0xc2ef363238068df4df5aa5eb2f1a6d695416c3cd9ef2b3c3cff7a46673bb03c2",
+                    "stateRoot" : "0x07cb7b97d3a9fbf5ec485d9bca713c3b672e0ab32194aa587b081aa51da32aac",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0bbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed00b4dcfea14503f89ad98f059f059f8232d0273006a4a546a0985a92979b4ba01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0b38a8503ca34336efb7f39c6f21c270ba2559492d933aad99e09bc0870628de1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b2bb8203e880a06b52228847790a4257c8df5bd8c9a4edec9abcc1edbe1b35ed085440d4198a5588a634d394ca36ea68f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0668fb85814b8117f2deae45f5a783cd106f9b0652c1e81d551102e93d55e2d26a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa007cb7b97d3a9fbf5ec485d9bca713c3b672e0ab32194aa587b081aa51da32aaca01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0c2ef363238068df4df5aa5eb2f1a6d695416c3cd9ef2b3c3cff7a46673bb03c2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b3888203e880a06583d6387dd5c581a5f5c235090e195e536639b368d537583ae7977757203682883ff7a98a32dea310f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -50,31 +50,24 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0xbbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1",
+            "hash" : "0x668fb85814b8117f2deae45f5a783cd106f9b0652c1e81d551102e93d55e2d26",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x4ac040888c74c8463e7a4fff574a7ccff2b114f416d65a0b0f5a3106b75f6040",
+            "stateRoot" : "0xdd4e31ed645f747a6592a3b559208b048cfa511f806cf2152d67096cbb514d49",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ac040888c74c8463e7a4fff574a7ccff2b114f416d65a0b0f5a3106b75f6040a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdbf932ced2541aae0f182668475799d2b02443e71f7b08b8ad9a38259ed30564",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd4e31ed645f747a6592a3b559208b048cfa511f806cf2152d67096cbb514d49a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5a9d3497e7eb878e737e015cebf5074c41501c1240ce70fe4e3ebc43be7383a4",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545060ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x0a" : "0x8000000000000000000000000000000000000000000000000000000000000000",
@@ -82,14 +75,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b2bb",
+                "balance" : "0x29a2241af62cb388",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xd3e5",
+                "balance" : "0xd318",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -99,7 +92,7 @@
         "pre" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545060ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x01" : "0x01",
@@ -122,7 +115,7 @@
     "refund50percentCap_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50percentCap_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -133,19 +126,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb2bb",
-                    "hash" : "0xa2dc0c129670e0fdd36ed79d7fbfd474b08855801f705dda0ef479b4e5b6e039",
-                    "mixHash" : "0xa23373fe9aad6715088c0ef76081813c9e53085b475fc9202f073ee11dae352d",
-                    "nonce" : "0x6a6da078b9f8784f",
+                    "gasUsed" : "0xb388",
+                    "hash" : "0x980daf426131e3a91f3a14a43517e463af3ef0f49eaa349bad64d2d21675baa1",
+                    "mixHash" : "0x6b0d02d77159c18f7b48f82e95b2a756dddc959b3d2d8f8eab2707378d72aeb7",
+                    "nonce" : "0xde593caaf93c3b5a",
                     "number" : "0x01",
-                    "parentHash" : "0xbbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1",
-                    "receiptTrie" : "0xb38a8503ca34336efb7f39c6f21c270ba2559492d933aad99e09bc0870628de1",
-                    "stateRoot" : "0xed00b4dcfea14503f89ad98f059f059f8232d0273006a4a546a0985a92979b4b",
+                    "parentHash" : "0x668fb85814b8117f2deae45f5a783cd106f9b0652c1e81d551102e93d55e2d26",
+                    "receiptTrie" : "0xc2ef363238068df4df5aa5eb2f1a6d695416c3cd9ef2b3c3cff7a46673bb03c2",
+                    "stateRoot" : "0x0cc31a10b6a58f27b359f9374ab14fc1fee85fd843b3a6ca40032bd3b06f7730",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0bbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed00b4dcfea14503f89ad98f059f059f8232d0273006a4a546a0985a92979b4ba01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0b38a8503ca34336efb7f39c6f21c270ba2559492d933aad99e09bc0870628de1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b2bb8203e880a0a23373fe9aad6715088c0ef76081813c9e53085b475fc9202f073ee11dae352d886a6da078b9f8784ff862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0668fb85814b8117f2deae45f5a783cd106f9b0652c1e81d551102e93d55e2d26a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00cc31a10b6a58f27b359f9374ab14fc1fee85fd843b3a6ca40032bd3b06f7730a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0c2ef363238068df4df5aa5eb2f1a6d695416c3cd9ef2b3c3cff7a46673bb03c2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b3888203e880a06b0d02d77159c18f7b48f82e95b2a756dddc959b3d2d8f8eab2707378d72aeb788de593caaf93c3b5af862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -170,19 +163,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0xbbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1",
+            "hash" : "0x668fb85814b8117f2deae45f5a783cd106f9b0652c1e81d551102e93d55e2d26",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x4ac040888c74c8463e7a4fff574a7ccff2b114f416d65a0b0f5a3106b75f6040",
+            "stateRoot" : "0xdd4e31ed645f747a6592a3b559208b048cfa511f806cf2152d67096cbb514d49",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ac040888c74c8463e7a4fff574a7ccff2b114f416d65a0b0f5a3106b75f6040a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa2dc0c129670e0fdd36ed79d7fbfd474b08855801f705dda0ef479b4e5b6e039",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd4e31ed645f747a6592a3b559208b048cfa511f806cf2152d67096cbb514d49a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x980daf426131e3a91f3a14a43517e463af3ef0f49eaa349bad64d2d21675baa1",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -194,7 +187,7 @@
             },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545060ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x0a" : "0x8000000000000000000000000000000000000000000000000000000000000000",
@@ -202,14 +195,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b2bb",
+                "balance" : "0x29a2241af62cb388",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xd3e5",
+                "balance" : "0xd318",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -219,7 +212,7 @@
         "pre" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545060ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x01" : "0x01",
@@ -242,7 +235,7 @@
     "refund50percentCap_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50percentCap_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -253,19 +246,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb2a7",
-                    "hash" : "0x8651edd83f165e2497293b85dbcc9dff52844c801863cf2aab78dd6b3115ab3a",
-                    "mixHash" : "0x39d4b3d35f8eb1c94428577f1e3077feb3cdd5c5efe3a07fc8185bf88c1437ea",
-                    "nonce" : "0xf152521d6af80ad3",
+                    "gasUsed" : "0xb374",
+                    "hash" : "0xf29056502f3ec50f4b129cb5041c11b79c299711afbd27baec6572664ad2cb94",
+                    "mixHash" : "0xb9eb190fca0ab7511cdc02f7e55f780b97b70f6a2a9798bf960ed6c6cf57e628",
+                    "nonce" : "0xd4eefe19ca7010df",
                     "number" : "0x01",
-                    "parentHash" : "0xbbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1",
-                    "receiptTrie" : "0x6954600f12c7ec8cc5551388a6009bae7177a6d405de8b060a83ac0b98638482",
-                    "stateRoot" : "0x4305d79528182cbdbca413b689dfb7a9380b3016ed0ab7a82a40a5b7b534bd4b",
+                    "parentHash" : "0x668fb85814b8117f2deae45f5a783cd106f9b0652c1e81d551102e93d55e2d26",
+                    "receiptTrie" : "0xa54905b466e17b1d77ccf45e6f27fa34e2a0b898900d5732f14f3612f8f2fc10",
+                    "stateRoot" : "0x0bbc0819cdaecc6176825b27c771541e4242e1e347b3e3f21f58eb3c67211d5d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0bbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04305d79528182cbdbca413b689dfb7a9380b3016ed0ab7a82a40a5b7b534bd4ba01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a06954600f12c7ec8cc5551388a6009bae7177a6d405de8b060a83ac0b98638482b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b2a78203e880a039d4b3d35f8eb1c94428577f1e3077feb3cdd5c5efe3a07fc8185bf88c1437ea88f152521d6af80ad3f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0668fb85814b8117f2deae45f5a783cd106f9b0652c1e81d551102e93d55e2d26a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00bbc0819cdaecc6176825b27c771541e4242e1e347b3e3f21f58eb3c67211d5da01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0a54905b466e17b1d77ccf45e6f27fa34e2a0b898900d5732f14f3612f8f2fc10b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b3748203e880a0b9eb190fca0ab7511cdc02f7e55f780b97b70f6a2a9798bf960ed6c6cf57e62888d4eefe19ca7010dff862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -290,24 +283,24 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0xbbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1",
+            "hash" : "0x668fb85814b8117f2deae45f5a783cd106f9b0652c1e81d551102e93d55e2d26",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x4ac040888c74c8463e7a4fff574a7ccff2b114f416d65a0b0f5a3106b75f6040",
+            "stateRoot" : "0xdd4e31ed645f747a6592a3b559208b048cfa511f806cf2152d67096cbb514d49",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ac040888c74c8463e7a4fff574a7ccff2b114f416d65a0b0f5a3106b75f6040a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8651edd83f165e2497293b85dbcc9dff52844c801863cf2aab78dd6b3115ab3a",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd4e31ed645f747a6592a3b559208b048cfa511f806cf2152d67096cbb514d49a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf29056502f3ec50f4b129cb5041c11b79c299711afbd27baec6572664ad2cb94",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545060ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x0a" : "0x8000000000000000000000000000000000000000000000000000000000000000",
@@ -315,14 +308,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b2a7",
+                "balance" : "0x4563918244f4b374",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xd3f9",
+                "balance" : "0xd32c",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -332,7 +325,7 @@
         "pre" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545060ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x01" : "0x01",
@@ -355,7 +348,7 @@
     "refund50percentCap_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50percentCap_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -366,19 +359,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb2bb",
-                    "hash" : "0x88e95557a64f3d5b749d64a45c6284206c6100195e61fc210b2921d0c64abb62",
-                    "mixHash" : "0x46664b2d865881f9ba2d442f5e6369b6c8b02edc80ab8a0ec7c5f89a71420d2c",
-                    "nonce" : "0x3374fc914177c830",
+                    "gasUsed" : "0xb388",
+                    "hash" : "0x3faa7d4849ccc4fd0354c29b39afa30ae94d733dd95b80b7d0cabbca7e1f8466",
+                    "mixHash" : "0xbaf66b3a0459c91308ad87a54b92f3505b860d782c7dcb14087ed307cb192551",
+                    "nonce" : "0xd6bb9af2eed634d1",
                     "number" : "0x01",
-                    "parentHash" : "0xbbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1",
-                    "receiptTrie" : "0x73ffc736ec20a7037f9ecc5c272543044f25a1e7536cdfd497abc1964b305e55",
-                    "stateRoot" : "0xc30b2a3bc71484a531530b6089f2dde5f33fae5f0140be373b14191aa68d20de",
+                    "parentHash" : "0x668fb85814b8117f2deae45f5a783cd106f9b0652c1e81d551102e93d55e2d26",
+                    "receiptTrie" : "0x49e6259afd4eb0a9d087e1d2eeefdb93194a6ad9abc4a7b723abefaf72050f55",
+                    "stateRoot" : "0xefa85a7acb8cdee65ffcd82f4029ba2c3adc1d73b247d6768c14f52ebeaa1673",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0bbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c30b2a3bc71484a531530b6089f2dde5f33fae5f0140be373b14191aa68d20dea01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a073ffc736ec20a7037f9ecc5c272543044f25a1e7536cdfd497abc1964b305e55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b2bb8203e880a046664b2d865881f9ba2d442f5e6369b6c8b02edc80ab8a0ec7c5f89a71420d2c883374fc914177c830f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0668fb85814b8117f2deae45f5a783cd106f9b0652c1e81d551102e93d55e2d26a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0efa85a7acb8cdee65ffcd82f4029ba2c3adc1d73b247d6768c14f52ebeaa1673a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a049e6259afd4eb0a9d087e1d2eeefdb93194a6ad9abc4a7b723abefaf72050f55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b3888203e880a0baf66b3a0459c91308ad87a54b92f3505b860d782c7dcb14087ed307cb19255188d6bb9af2eed634d1f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -403,24 +396,24 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0xbbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1",
+            "hash" : "0x668fb85814b8117f2deae45f5a783cd106f9b0652c1e81d551102e93d55e2d26",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x4ac040888c74c8463e7a4fff574a7ccff2b114f416d65a0b0f5a3106b75f6040",
+            "stateRoot" : "0xdd4e31ed645f747a6592a3b559208b048cfa511f806cf2152d67096cbb514d49",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ac040888c74c8463e7a4fff574a7ccff2b114f416d65a0b0f5a3106b75f6040a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x88e95557a64f3d5b749d64a45c6284206c6100195e61fc210b2921d0c64abb62",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd4e31ed645f747a6592a3b559208b048cfa511f806cf2152d67096cbb514d49a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3faa7d4849ccc4fd0354c29b39afa30ae94d733dd95b80b7d0cabbca7e1f8466",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545060ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x0a" : "0x8000000000000000000000000000000000000000000000000000000000000000",
@@ -428,14 +421,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b2bb",
+                "balance" : "0x4563918244f4b388",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xd3e5",
+                "balance" : "0xd318",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -445,7 +438,7 @@
         "pre" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545060ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x01" : "0x01",
@@ -468,7 +461,7 @@
     "refund50percentCap_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50percentCap_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -479,19 +472,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb1e9",
-                    "hash" : "0x2cc752a2c1325d6f146ffac4a9817154af17ff88309df9faf3ff757b773dc236",
-                    "mixHash" : "0xaa3a04b02e6f69a961bdf15a39fffb197e863653798f670342defef2e3db509c",
-                    "nonce" : "0xb7c6cb822ce6a7b7",
+                    "gasUsed" : "0xb220",
+                    "hash" : "0x6841d45df3a02410a6e21924ad5df7b040b24bc288df06fb354bb540939c290b",
+                    "mixHash" : "0xfc9af248ddd78836a0a5d7cbb3bddbf3154a8b86b8998fd37feeb3e4a265e722",
+                    "nonce" : "0x90f35dabfc40ce5a",
                     "number" : "0x01",
-                    "parentHash" : "0xbbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1",
-                    "receiptTrie" : "0x3ae5a66092a29e80e4d5a8686561286f3b7fca7599164aafa3d7d9ffb0b4ccb8",
-                    "stateRoot" : "0x080df517124156b416981478ebe8673180a891182da9aba054cc5a891a539959",
+                    "parentHash" : "0x668fb85814b8117f2deae45f5a783cd106f9b0652c1e81d551102e93d55e2d26",
+                    "receiptTrie" : "0xbfbac8e38f819ed6adb16573421e5ad751f847aecfab39f6d0714c7e7ef44610",
+                    "stateRoot" : "0xe92f61deccdfe5aeb2f429b67b3ab0e2aaec97ec6b62ff5c538b624898295b75",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0bbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0080df517124156b416981478ebe8673180a891182da9aba054cc5a891a539959a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a03ae5a66092a29e80e4d5a8686561286f3b7fca7599164aafa3d7d9ffb0b4ccb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b1e98203e880a0aa3a04b02e6f69a961bdf15a39fffb197e863653798f670342defef2e3db509c88b7c6cb822ce6a7b7f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0668fb85814b8117f2deae45f5a783cd106f9b0652c1e81d551102e93d55e2d26a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e92f61deccdfe5aeb2f429b67b3ab0e2aaec97ec6b62ff5c538b624898295b75a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0bfbac8e38f819ed6adb16573421e5ad751f847aecfab39f6d0714c7e7ef44610b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b2208203e880a0fc9af248ddd78836a0a5d7cbb3bddbf3154a8b86b8998fd37feeb3e4a265e7228890f35dabfc40ce5af862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -516,24 +509,24 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0xbbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1",
+            "hash" : "0x668fb85814b8117f2deae45f5a783cd106f9b0652c1e81d551102e93d55e2d26",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x4ac040888c74c8463e7a4fff574a7ccff2b114f416d65a0b0f5a3106b75f6040",
+            "stateRoot" : "0xdd4e31ed645f747a6592a3b559208b048cfa511f806cf2152d67096cbb514d49",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ac040888c74c8463e7a4fff574a7ccff2b114f416d65a0b0f5a3106b75f6040a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2cc752a2c1325d6f146ffac4a9817154af17ff88309df9faf3ff757b773dc236",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd4e31ed645f747a6592a3b559208b048cfa511f806cf2152d67096cbb514d49a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6841d45df3a02410a6e21924ad5df7b040b24bc288df06fb354bb540939c290b",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545060ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x0a" : "0x8000000000000000000000000000000000000000000000000000000000000000",
@@ -541,14 +534,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b1e9",
+                "balance" : "0x4563918244f4b220",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xd4b7",
+                "balance" : "0xd480",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -558,7 +551,7 @@
         "pre" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545060ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x01" : "0x01",
@@ -581,7 +574,7 @@
     "refund50percentCap_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund50percentCap_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -592,19 +585,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb1e9",
-                    "hash" : "0x06d0b102f898384bb9a488145397e7e8fbcbb8fb76e15da31e31551945ea9199",
-                    "mixHash" : "0xdc9af7ff0bfa7fa3b18d8caefe22ffeb7160c179330a36a567f4fb6947daf0fb",
-                    "nonce" : "0xed4b44a3130da06b",
+                    "gasUsed" : "0xb220",
+                    "hash" : "0x240a60237b98edbd20ca84d3f87d1d44ade5e09fe7af9f4ebe580af70b72c418",
+                    "mixHash" : "0xdde28d517096e30d41177bb4297d8b9be453a19374d1cbf570427dab20530d1e",
+                    "nonce" : "0x865f34de1fc60661",
                     "number" : "0x01",
-                    "parentHash" : "0xbbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1",
-                    "receiptTrie" : "0x3ae5a66092a29e80e4d5a8686561286f3b7fca7599164aafa3d7d9ffb0b4ccb8",
-                    "stateRoot" : "0x080df517124156b416981478ebe8673180a891182da9aba054cc5a891a539959",
+                    "parentHash" : "0x668fb85814b8117f2deae45f5a783cd106f9b0652c1e81d551102e93d55e2d26",
+                    "receiptTrie" : "0xbfbac8e38f819ed6adb16573421e5ad751f847aecfab39f6d0714c7e7ef44610",
+                    "stateRoot" : "0xe92f61deccdfe5aeb2f429b67b3ab0e2aaec97ec6b62ff5c538b624898295b75",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0bbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0080df517124156b416981478ebe8673180a891182da9aba054cc5a891a539959a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a03ae5a66092a29e80e4d5a8686561286f3b7fca7599164aafa3d7d9ffb0b4ccb8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b1e98203e880a0dc9af7ff0bfa7fa3b18d8caefe22ffeb7160c179330a36a567f4fb6947daf0fb88ed4b44a3130da06bf862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0668fb85814b8117f2deae45f5a783cd106f9b0652c1e81d551102e93d55e2d26a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e92f61deccdfe5aeb2f429b67b3ab0e2aaec97ec6b62ff5c538b624898295b75a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0bfbac8e38f819ed6adb16573421e5ad751f847aecfab39f6d0714c7e7ef44610b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b2208203e880a0dde28d517096e30d41177bb4297d8b9be453a19374d1cbf570427dab20530d1e88865f34de1fc60661f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -629,24 +622,24 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0xbbe5d5ccc6a5b940894afc7df5d84ba206930dccace09e02a92f4ce9813509e1",
+            "hash" : "0x668fb85814b8117f2deae45f5a783cd106f9b0652c1e81d551102e93d55e2d26",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x4ac040888c74c8463e7a4fff574a7ccff2b114f416d65a0b0f5a3106b75f6040",
+            "stateRoot" : "0xdd4e31ed645f747a6592a3b559208b048cfa511f806cf2152d67096cbb514d49",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ac040888c74c8463e7a4fff574a7ccff2b114f416d65a0b0f5a3106b75f6040a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x06d0b102f898384bb9a488145397e7e8fbcbb8fb76e15da31e31551945ea9199",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd4e31ed645f747a6592a3b559208b048cfa511f806cf2152d67096cbb514d49a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x240a60237b98edbd20ca84d3f87d1d44ade5e09fe7af9f4ebe580af70b72c418",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545060ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x0a" : "0x8000000000000000000000000000000000000000000000000000000000000000",
@@ -654,14 +647,14 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4b1e9",
+                "balance" : "0x4563918244f4b220",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xd4b7",
+                "balance" : "0xd480",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -671,7 +664,7 @@
         "pre" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545060ff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x01" : "0x01",
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund600_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund600_d0g0v0.json
index 737013438..056493751 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund600_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund600_d0g0v0.json
@@ -2,7 +2,7 @@
     "refund600_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund600_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -13,19 +13,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x9588",
-                    "hash" : "0x7cb2c719670549d2e5490eda6b3c18fe400b5cf2c282ca3f22976b3a335bf7ab",
-                    "mixHash" : "0x007df548a3e21fa85b5070326fdbe253889413c6efdfd61c6e1c877413dea32c",
-                    "nonce" : "0xa95b6e54cfc5c6c0",
+                    "gasUsed" : "0x9655",
+                    "hash" : "0xdfa91d69caff5064bd13580e8f7f7de449ba5edd4c970668a827a4304d77a37d",
+                    "mixHash" : "0x34a5ee9dfcc584b31a8e874d688dc478b9a454af7e56fe6448a306e973f50694",
+                    "nonce" : "0x6aff89b77d2cbb21",
                     "number" : "0x01",
-                    "parentHash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
-                    "receiptTrie" : "0x85fcb31b2fc11e7794da2d4bec0e4c52fc3a10f4a60d80ab1ae869e0b1cd50a9",
-                    "stateRoot" : "0x29382d5fb8cabf97a6bb32afb5a5e7c3765dfb44b96e7d0229e870bb1b5d1201",
+                    "parentHash" : "0x465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6",
+                    "receiptTrie" : "0x9cac1049ccce5e51dceb87bd0eb46129c2c34c4298f70a1bd0ed38ed96f8fa9c",
+                    "stateRoot" : "0x6c4247e800f456ffc423aa206d2a4c8b87abb4124fc88c955a58e8c3d376a9fe",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0d5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029382d5fb8cabf97a6bb32afb5a5e7c3765dfb44b96e7d0229e870bb1b5d1201a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a085fcb31b2fc11e7794da2d4bec0e4c52fc3a10f4a60d80ab1ae869e0b1cd50a9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408295888203e880a0007df548a3e21fa85b5070326fdbe253889413c6efdfd61c6e1c877413dea32c88a95b6e54cfc5c6c0f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c4247e800f456ffc423aa206d2a4c8b87abb4124fc88c955a58e8c3d376a9fea01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a09cac1049ccce5e51dceb87bd0eb46129c2c34c4298f70a1bd0ed38ed96f8fa9cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408296558203e880a034a5ee9dfcc584b31a8e874d688dc478b9a454af7e56fe6448a306e973f50694886aff89b77d2cbb21f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -50,45 +50,38 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
+            "hash" : "0x465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x6cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575",
+            "stateRoot" : "0x48cbc787bd3180842707ed99d21d04e829b47f449f9a8b130d469e98e42956e2",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7cb2c719670549d2e5490eda6b3c18fe400b5cf2c282ca3f22976b3a335bf7ab",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048cbc787bd3180842707ed99d21d04e829b47f449f9a8b130d469e98e42956e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdfa91d69caff5064bd13580e8f7f7de449ba5edd4c970668a827a4304d77a37d",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x0b" : "0x0de0b6b3a7640000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49588",
+                "balance" : "0x29a2241af62c9655",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xf118",
+                "balance" : "0xf04b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -98,7 +91,7 @@
         "pre" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x01" : "0x01",
@@ -121,7 +114,7 @@
     "refund600_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund600_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -132,19 +125,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x9588",
-                    "hash" : "0xbb2324dccb9161d89e5ceb8438208497be701e68358cd32b0814276e736cd45f",
-                    "mixHash" : "0x45aefe001be75af395171d6a9ad3d5b2a9cd220220092b83060c2e5161629a63",
-                    "nonce" : "0xeb61d76d3e36b693",
+                    "gasUsed" : "0x9655",
+                    "hash" : "0x3baafdab910627b3cb461fb12284eec17dfb922d7984663acfaaa507a631da5f",
+                    "mixHash" : "0x9a0931ed0b6c6a7528085f68220e5c9d785ae17ecb0a3d83589bdf45b6c3caec",
+                    "nonce" : "0xd44821bc0270627b",
                     "number" : "0x01",
-                    "parentHash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
-                    "receiptTrie" : "0x85fcb31b2fc11e7794da2d4bec0e4c52fc3a10f4a60d80ab1ae869e0b1cd50a9",
-                    "stateRoot" : "0x29382d5fb8cabf97a6bb32afb5a5e7c3765dfb44b96e7d0229e870bb1b5d1201",
+                    "parentHash" : "0x465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6",
+                    "receiptTrie" : "0x9cac1049ccce5e51dceb87bd0eb46129c2c34c4298f70a1bd0ed38ed96f8fa9c",
+                    "stateRoot" : "0xdabdb05f61330dba5c333411433c9762e7b0ebdbb2aba5e889d3da8e95db8851",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0d5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029382d5fb8cabf97a6bb32afb5a5e7c3765dfb44b96e7d0229e870bb1b5d1201a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a085fcb31b2fc11e7794da2d4bec0e4c52fc3a10f4a60d80ab1ae869e0b1cd50a9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408295888203e880a045aefe001be75af395171d6a9ad3d5b2a9cd220220092b83060c2e5161629a6388eb61d76d3e36b693f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dabdb05f61330dba5c333411433c9762e7b0ebdbb2aba5e889d3da8e95db8851a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a09cac1049ccce5e51dceb87bd0eb46129c2c34c4298f70a1bd0ed38ed96f8fa9cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408296558203e880a09a0931ed0b6c6a7528085f68220e5c9d785ae17ecb0a3d83589bdf45b6c3caec88d44821bc0270627bf862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -169,19 +162,19 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
+            "hash" : "0x465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x6cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575",
+            "stateRoot" : "0x48cbc787bd3180842707ed99d21d04e829b47f449f9a8b130d469e98e42956e2",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbb2324dccb9161d89e5ceb8438208497be701e68358cd32b0814276e736cd45f",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048cbc787bd3180842707ed99d21d04e829b47f449f9a8b130d469e98e42956e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3baafdab910627b3cb461fb12284eec17dfb922d7984663acfaaa507a631da5f",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -193,21 +186,21 @@
             },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x0b" : "0x0de0b6b3a7640000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49588",
+                "balance" : "0x29a2241af62c9655",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xf118",
+                "balance" : "0xf04b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -217,7 +210,7 @@
         "pre" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x01" : "0x01",
@@ -240,7 +233,7 @@
     "refund600_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund600_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -251,19 +244,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x9560",
-                    "hash" : "0x9aa1aa15d4fe3db173fc4c4b9f87b8d18377829fe3159035820f7b6188311f9a",
-                    "mixHash" : "0x004ffea2e4137e7b8d6bf3edad4bfd1bfd8001c62cab5c0ba6270d34f5e24ad0",
-                    "nonce" : "0x99629a1457ee06f2",
+                    "gasUsed" : "0x962d",
+                    "hash" : "0x01da1440e84d6dd72bbdf36f07b6d19db28cfd00f532b4d302d937b938e8839f",
+                    "mixHash" : "0x67e9afacc6d239fcbf23b277c48774abd97633607d34823152fc6b0811c93414",
+                    "nonce" : "0x602c81dac5018063",
                     "number" : "0x01",
-                    "parentHash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
-                    "receiptTrie" : "0xac6159a0ed393b347e0d98c8646fe5586d3c818bbb64cd7ad3a023d8ff8cd5a3",
-                    "stateRoot" : "0x119de67a3b9b33d5c61c4519e085e65733a3ff8079c4ce1a0e0a55b0c0ce76bc",
+                    "parentHash" : "0x465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6",
+                    "receiptTrie" : "0x2e14299ed55e27cda5180ef76cbd8cfbe6817a98069f0be0b5b15686fc77f86a",
+                    "stateRoot" : "0xc2381d9337ca2d3cce278819f78d646fd61f971c8e9d5dd69405469459cbf556",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0d5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0119de67a3b9b33d5c61c4519e085e65733a3ff8079c4ce1a0e0a55b0c0ce76bca01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0ac6159a0ed393b347e0d98c8646fe5586d3c818bbb64cd7ad3a023d8ff8cd5a3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408295608203e880a0004ffea2e4137e7b8d6bf3edad4bfd1bfd8001c62cab5c0ba6270d34f5e24ad08899629a1457ee06f2f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c2381d9337ca2d3cce278819f78d646fd61f971c8e9d5dd69405469459cbf556a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a02e14299ed55e27cda5180ef76cbd8cfbe6817a98069f0be0b5b15686fc77f86ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082962d8203e880a067e9afacc6d239fcbf23b277c48774abd97633607d34823152fc6b0811c9341488602c81dac5018063f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -288,38 +281,38 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
+            "hash" : "0x465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x6cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575",
+            "stateRoot" : "0x48cbc787bd3180842707ed99d21d04e829b47f449f9a8b130d469e98e42956e2",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9aa1aa15d4fe3db173fc4c4b9f87b8d18377829fe3159035820f7b6188311f9a",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048cbc787bd3180842707ed99d21d04e829b47f449f9a8b130d469e98e42956e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x01da1440e84d6dd72bbdf36f07b6d19db28cfd00f532b4d302d937b938e8839f",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x0b" : "0x0de0b6b3a7640000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49560",
+                "balance" : "0x4563918244f4962d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xf140",
+                "balance" : "0xf073",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -329,7 +322,7 @@
         "pre" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x01" : "0x01",
@@ -352,7 +345,7 @@
     "refund600_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund600_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -363,19 +356,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x9588",
-                    "hash" : "0xb0dff7503f4f4ab6fd8b801ea36947b77236bdf1ca92e524d697e756b0c09e0e",
-                    "mixHash" : "0x0e7694fb7b65caad5110e25db1c6f04b93889b518b4e07052e994b9385ddea77",
-                    "nonce" : "0x8e2efef87b139e35",
+                    "gasUsed" : "0x9655",
+                    "hash" : "0x1bbbb2a3c7a5a549961d2caf36e789b7e9cae16320331a81b16d53c2b6a3ab89",
+                    "mixHash" : "0x87a85829244a17d6a1db390d942c00c42586e8e5b1c15bc938d111a81f6cd344",
+                    "nonce" : "0x312609b07ebedc82",
                     "number" : "0x01",
-                    "parentHash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
-                    "receiptTrie" : "0x53636dd66dc734988219e0d6e4af851e1102f44c0e67f39ec78252f9a4672c57",
-                    "stateRoot" : "0x1dc78e28028421ede57e5188f5f85369b631c02eac7d5d8520cf5c0786091897",
+                    "parentHash" : "0x465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6",
+                    "receiptTrie" : "0x7ce5a13d26e801129a081814150c42be4d153fb7b1198c0fa89e0565c2d42eea",
+                    "stateRoot" : "0xdd9864e70849d920dd790faff7d2338ccd1a7e1591139ede1a99ad5b28663fd5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0d5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc78e28028421ede57e5188f5f85369b631c02eac7d5d8520cf5c0786091897a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a053636dd66dc734988219e0d6e4af851e1102f44c0e67f39ec78252f9a4672c57b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408295888203e880a00e7694fb7b65caad5110e25db1c6f04b93889b518b4e07052e994b9385ddea77888e2efef87b139e35f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd9864e70849d920dd790faff7d2338ccd1a7e1591139ede1a99ad5b28663fd5a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a07ce5a13d26e801129a081814150c42be4d153fb7b1198c0fa89e0565c2d42eeab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408296558203e880a087a85829244a17d6a1db390d942c00c42586e8e5b1c15bc938d111a81f6cd34488312609b07ebedc82f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -400,38 +393,38 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
+            "hash" : "0x465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x6cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575",
+            "stateRoot" : "0x48cbc787bd3180842707ed99d21d04e829b47f449f9a8b130d469e98e42956e2",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb0dff7503f4f4ab6fd8b801ea36947b77236bdf1ca92e524d697e756b0c09e0e",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048cbc787bd3180842707ed99d21d04e829b47f449f9a8b130d469e98e42956e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x1bbbb2a3c7a5a549961d2caf36e789b7e9cae16320331a81b16d53c2b6a3ab89",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x0b" : "0x0de0b6b3a7640000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49588",
+                "balance" : "0x4563918244f49655",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xf118",
+                "balance" : "0xf04b",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -441,7 +434,7 @@
         "pre" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x01" : "0x01",
@@ -464,7 +457,7 @@
     "refund600_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund600_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -475,19 +468,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x94a2",
-                    "hash" : "0x56c21b2580f329fa41baf43a6c3aff0949040b4edbe13ac867c099111ce235c3",
-                    "mixHash" : "0x086a34b4e33303ab291fa1107367282b1cec02c68beaf1086b7b2cd74624b3a7",
-                    "nonce" : "0xfbc408bffbe2e5c3",
+                    "gasUsed" : "0x94d9",
+                    "hash" : "0xdb595d341854ec0c3cac4c64988e89a5c846e6b17d4a7b171366a92939dc5442",
+                    "mixHash" : "0xd9c8dadf6978371e92a41004582412e9861eefac18f0d30097874f3b74f173a2",
+                    "nonce" : "0xd03c2f36f781545f",
                     "number" : "0x01",
-                    "parentHash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
-                    "receiptTrie" : "0x78e37a040d605d97cb9646d820918e6a4e2d7105f84c9fb48ced73cb2c624c2f",
-                    "stateRoot" : "0xd3423c64816ff9b58f782825c1faa86754a56090a7d69d0ed3da1384510acc0f",
+                    "parentHash" : "0x465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6",
+                    "receiptTrie" : "0xe67305d69251c76b8c0e2409fe81f733e8afea10072a04a7a6549c4a7ff70c7e",
+                    "stateRoot" : "0x91f32859fe00d955ed426252906a137a96827ccdb9007c0eb2ee10bb3ec25727",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0d5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d3423c64816ff9b58f782825c1faa86754a56090a7d69d0ed3da1384510acc0fa01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a078e37a040d605d97cb9646d820918e6a4e2d7105f84c9fb48ced73cb2c624c2fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408294a28203e880a0086a34b4e33303ab291fa1107367282b1cec02c68beaf1086b7b2cd74624b3a788fbc408bffbe2e5c3f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091f32859fe00d955ed426252906a137a96827ccdb9007c0eb2ee10bb3ec25727a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0e67305d69251c76b8c0e2409fe81f733e8afea10072a04a7a6549c4a7ff70c7eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408294d98203e880a0d9c8dadf6978371e92a41004582412e9861eefac18f0d30097874f3b74f173a288d03c2f36f781545ff862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -512,38 +505,38 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
+            "hash" : "0x465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x6cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575",
+            "stateRoot" : "0x48cbc787bd3180842707ed99d21d04e829b47f449f9a8b130d469e98e42956e2",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x56c21b2580f329fa41baf43a6c3aff0949040b4edbe13ac867c099111ce235c3",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048cbc787bd3180842707ed99d21d04e829b47f449f9a8b130d469e98e42956e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xdb595d341854ec0c3cac4c64988e89a5c846e6b17d4a7b171366a92939dc5442",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x0b" : "0x0de0b6b3a7640000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f494a2",
+                "balance" : "0x4563918244f494d9",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xf1fe",
+                "balance" : "0xf1c7",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -553,7 +546,7 @@
         "pre" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x01" : "0x01",
@@ -576,7 +569,7 @@
     "refund600_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund600_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -587,19 +580,19 @@
                     "difficulty" : "0x020000",
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x94a2",
-                    "hash" : "0x0dfae1f5bee251d5674aa73d399cbb42e989ea03daf36da232bee9de2856ce88",
-                    "mixHash" : "0xa5a07987e16619c9085e18e6dbb2ae7237187fe8c11ca837ad101b78c533ab6e",
-                    "nonce" : "0x033602124a67c8bd",
+                    "gasUsed" : "0x94d9",
+                    "hash" : "0xc5a92ca11fa014d113c3f3aada053a36e39263098fc9f1829c72e218764875c5",
+                    "mixHash" : "0xe2eb526bd72b093403930cbd5950468d9ddd8629093c6b6cc7b23c8b6231311e",
+                    "nonce" : "0x69a176d7fbce5374",
                     "number" : "0x01",
-                    "parentHash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
-                    "receiptTrie" : "0x78e37a040d605d97cb9646d820918e6a4e2d7105f84c9fb48ced73cb2c624c2f",
-                    "stateRoot" : "0xd3423c64816ff9b58f782825c1faa86754a56090a7d69d0ed3da1384510acc0f",
+                    "parentHash" : "0x465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6",
+                    "receiptTrie" : "0xe67305d69251c76b8c0e2409fe81f733e8afea10072a04a7a6549c4a7ff70c7e",
+                    "stateRoot" : "0x91f32859fe00d955ed426252906a137a96827ccdb9007c0eb2ee10bb3ec25727",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x1a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0d5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d3423c64816ff9b58f782825c1faa86754a56090a7d69d0ed3da1384510acc0fa01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a078e37a040d605d97cb9646d820918e6a4e2d7105f84c9fb48ced73cb2c624c2fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408294a28203e880a0a5a07987e16619c9085e18e6dbb2ae7237187fe8c11ca837ad101b78c533ab6e88033602124a67c8bdf862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
+                "rlp" : "0xf9025ff901f7a0465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091f32859fe00d955ed426252906a137a96827ccdb9007c0eb2ee10bb3ec25727a01a6f603f2b897f76cf62e7761f72219bab8dc3bc444e0f605a49be5e55bd2fa5a0e67305d69251c76b8c0e2409fe81f733e8afea10072a04a7a6549c4a7ff70c7eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408294d98203e880a0e2eb526bd72b093403930cbd5950468d9ddd8629093c6b6cc7b23c8b6231311e8869a176d7fbce5374f862f8608001830186a094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba044ee42f1060fee5d97a26c8a0ae68cf034f74d28d85eed944db611239574a3c6a01789712c8973a1563405c9d841f7342afe23155336a1d9725e551efb2811d54ec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -624,38 +617,38 @@
             "extraData" : "0x42",
             "gasLimit" : "0x0f4240",
             "gasUsed" : "0x00",
-            "hash" : "0xd5f197052bd705283e4bc4610864a150fda3436ceb12123fba968af6aa3b236a",
+            "hash" : "0x465b3af08cb46d48f2fdf45f6afac5c4de245eee2b3b44993aa07c89670936a6",
             "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "nonce" : "0x0102030405060708",
             "number" : "0x00",
             "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
             "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x6cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575",
+            "stateRoot" : "0x48cbc787bd3180842707ed99d21d04e829b47f449f9a8b130d469e98e42956e2",
             "timestamp" : "0x03b6",
             "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06cbbbd50ff1a2f4bce4fc2cf3f67066f469696965b8805337ff357014a1b0575a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0dfae1f5bee251d5674aa73d399cbb42e989ea03daf36da232bee9de2856ce88",
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048cbc787bd3180842707ed99d21d04e829b47f449f9a8b130d469e98e42956e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc5a92ca11fa014d113c3f3aada053a36e39263098fc9f1829c72e218764875c5",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x0b" : "0x0de0b6b3a7640000"
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f494a2",
+                "balance" : "0x4563918244f494d9",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xf1fe",
+                "balance" : "0xf1c7",
                 "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
@@ -665,7 +658,7 @@
         "pre" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x61ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
+                "code" : "0x600154506002545061ffff60020a600a553031600b55600060015560006002556000600355600060045560006005556000600655",
                 "nonce" : "0x00",
                 "storage" : {
                     "0x01" : "0x01",
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refundSuicide50procentCap_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refundSuicide50procentCap_d0g0v0.json
index f25242552..96140528d 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refundSuicide50procentCap_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refundSuicide50procentCap_d0g0v0.json
@@ -2,7 +2,7 @@
     "refundSuicide50procentCap_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refundSuicide50procentCap_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf91e",
-                    "hash" : "0xed60473b8a4ac93d51a3c2b3dc0b122f8797173fbb8b03829057f25b36afa75b",
-                    "mixHash" : "0xf256d608ed436a717d938264eda51ee19d66a9d7a453a7c9480888cb4377feaa",
-                    "nonce" : "0xc2a12a0e4f5e7636",
+                    "hash" : "0x317ff2ee54dcc1fecd71a1358d373ba9bd5cdc6422d24b241807914fd9021dc2",
+                    "mixHash" : "0x430d1a4cd61b0bd6ba5361b32da13e0b99c8a90f1cb3ec08d5702618302b694d",
+                    "nonce" : "0x6711668f6c7959ac",
                     "number" : "0x01",
                     "parentHash" : "0xbdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86b",
                     "receiptTrie" : "0xb93612e7a46897ce49cd632e5b99976ab8f830c09b315212bd32eb8ab8311a08",
-                    "stateRoot" : "0xf8c67f38ab7a6934f1c7179abdfdf7e8e4fa10d83513d342f1eb3f3073c68f1f",
+                    "stateRoot" : "0x4d74fe0b6a4b4d559f6cd1c813517348cbe8ccb7379e6fc27724e0e8e489d29e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8c67f38ab7a6934f1c7179abdfdf7e8e4fa10d83513d342f1eb3f3073c68f1fa0152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0ba0b93612e7a46897ce49cd632e5b99976ab8f830c09b315212bd32eb8ab8311a08b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f91e8203e880a0f256d608ed436a717d938264eda51ee19d66a9d7a453a7c9480888cb4377feaa88c2a12a0e4f5e7636f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000001f41ba0ca6eed05ee408be0dd60eaf1be4ed39e132fca30191b5d29a1d539f62659ee2da07638bed28aa6eec9d1b8a1a8e96f3fdb7117b2b0412f0804b1cb2f3f3c4f4056c0",
+                "rlp" : "0xf9027ff901f7a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04d74fe0b6a4b4d559f6cd1c813517348cbe8ccb7379e6fc27724e0e8e489d29ea0152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0ba0b93612e7a46897ce49cd632e5b99976ab8f830c09b315212bd32eb8ab8311a08b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f91e8203e880a0430d1a4cd61b0bd6ba5361b32da13e0b99c8a90f1cb3ec08d5702618302b694d886711668f6c7959acf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000001f41ba0ca6eed05ee408be0dd60eaf1be4ed39e132fca30191b5d29a1d539f62659ee2da07638bed28aa6eec9d1b8a1a8e96f3fdb7117b2b0412f0804b1cb2f3f3c4f4056c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b26249ae651a11898d83ff3824ce37f6ad82c7e5fb985cc974fba2d5b77d7fb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xed60473b8a4ac93d51a3c2b3dc0b122f8797173fbb8b03829057f25b36afa75b",
+        "lastblockhash" : "0x317ff2ee54dcc1fecd71a1358d373ba9bd5cdc6422d24b241807914fd9021dc2",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x5a6016556001600a556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600b55600060015560006002556000600355600060045560006005556000600655600060075560006008555a601755",
@@ -83,7 +76,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f91e",
+                "balance" : "0x29a2241af62cf91e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -139,7 +132,7 @@
     "refundSuicide50procentCap_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refundSuicide50procentCap_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -151,18 +144,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf91e",
-                    "hash" : "0x775fe02854a27c556c51838d094cab800bf337f5affbd45aa6c91be0e123a764",
-                    "mixHash" : "0x7fb0a673f4abfb262d4493b7da71d9dd94d95b03203288c708bf8ba06b3244c6",
-                    "nonce" : "0xe3b17a0085f608f8",
+                    "hash" : "0x9ccf0bf053414520e56388c7804a0a67a17bc73fb8d249a857ccb18338338abe",
+                    "mixHash" : "0x815b5d7b0a51b3c93b4f667b583b57a44f3672fd4ccaad958a86ec7dae9e21f8",
+                    "nonce" : "0x06067472b1896093",
                     "number" : "0x01",
                     "parentHash" : "0xbdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86b",
                     "receiptTrie" : "0xb93612e7a46897ce49cd632e5b99976ab8f830c09b315212bd32eb8ab8311a08",
-                    "stateRoot" : "0xf8c67f38ab7a6934f1c7179abdfdf7e8e4fa10d83513d342f1eb3f3073c68f1f",
+                    "stateRoot" : "0xe64f35e98c5accaf60f4ebca44fe4fd4562467385980d836bb44d50cc7218d9d",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8c67f38ab7a6934f1c7179abdfdf7e8e4fa10d83513d342f1eb3f3073c68f1fa0152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0ba0b93612e7a46897ce49cd632e5b99976ab8f830c09b315212bd32eb8ab8311a08b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f91e8203e880a07fb0a673f4abfb262d4493b7da71d9dd94d95b03203288c708bf8ba06b3244c688e3b17a0085f608f8f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000001f41ba0ca6eed05ee408be0dd60eaf1be4ed39e132fca30191b5d29a1d539f62659ee2da07638bed28aa6eec9d1b8a1a8e96f3fdb7117b2b0412f0804b1cb2f3f3c4f4056c0",
+                "rlp" : "0xf9027ff901f7a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e64f35e98c5accaf60f4ebca44fe4fd4562467385980d836bb44d50cc7218d9da0152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0ba0b93612e7a46897ce49cd632e5b99976ab8f830c09b315212bd32eb8ab8311a08b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f91e8203e880a0815b5d7b0a51b3c93b4f667b583b57a44f3672fd4ccaad958a86ec7dae9e21f88806067472b1896093f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000001f41ba0ca6eed05ee408be0dd60eaf1be4ed39e132fca30191b5d29a1d539f62659ee2da07638bed28aa6eec9d1b8a1a8e96f3fdb7117b2b0412f0804b1cb2f3f3c4f4056c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -199,7 +192,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b26249ae651a11898d83ff3824ce37f6ad82c7e5fb985cc974fba2d5b77d7fb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x775fe02854a27c556c51838d094cab800bf337f5affbd45aa6c91be0e123a764",
+        "lastblockhash" : "0x9ccf0bf053414520e56388c7804a0a67a17bc73fb8d249a857ccb18338338abe",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -220,7 +213,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f91e",
+                "balance" : "0x29a2241af62cf91e",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -276,7 +269,7 @@
     "refundSuicide50procentCap_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refundSuicide50procentCap_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -288,9 +281,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf91e",
-                    "hash" : "0x8a6e21b6c3f3b04b850b4e72f4ddaa49846f1ab18e8dfa1440dcf4eee3558514",
-                    "mixHash" : "0x22af19878fe52307b6279166195dbf3648828646b7c01709884431373598aa60",
-                    "nonce" : "0x6dbc7ad41102132c",
+                    "hash" : "0xbb3e9b87836b12635e9bf1a922429c4bcd5136b41d9e5808dac8449058053fdf",
+                    "mixHash" : "0xcf2a50a92d33373a5813afc5074164ccf039aafdd6a231f241abb60ed8805ff4",
+                    "nonce" : "0x72570ba83580b9a8",
                     "number" : "0x01",
                     "parentHash" : "0xbdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86b",
                     "receiptTrie" : "0xfe6c263b8c0c67f290121fa77b7e8983d6822602e1054be14dfd1c0d13f37b49",
@@ -299,7 +292,7 @@
                     "transactionsTrie" : "0x152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cabaef80ba954eee56e0adc11c5c5a6978f2be108757ae2318364acc1cae8355a0152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0ba0fe6c263b8c0c67f290121fa77b7e8983d6822602e1054be14dfd1c0d13f37b49b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f91e8203e880a022af19878fe52307b6279166195dbf3648828646b7c01709884431373598aa60886dbc7ad41102132cf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000001f41ba0ca6eed05ee408be0dd60eaf1be4ed39e132fca30191b5d29a1d539f62659ee2da07638bed28aa6eec9d1b8a1a8e96f3fdb7117b2b0412f0804b1cb2f3f3c4f4056c0",
+                "rlp" : "0xf9027ff901f7a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cabaef80ba954eee56e0adc11c5c5a6978f2be108757ae2318364acc1cae8355a0152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0ba0fe6c263b8c0c67f290121fa77b7e8983d6822602e1054be14dfd1c0d13f37b49b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f91e8203e880a0cf2a50a92d33373a5813afc5074164ccf039aafdd6a231f241abb60ed8805ff48872570ba83580b9a8f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000001f41ba0ca6eed05ee408be0dd60eaf1be4ed39e132fca30191b5d29a1d539f62659ee2da07638bed28aa6eec9d1b8a1a8e96f3fdb7117b2b0412f0804b1cb2f3f3c4f4056c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -336,7 +329,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b26249ae651a11898d83ff3824ce37f6ad82c7e5fb985cc974fba2d5b77d7fb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8a6e21b6c3f3b04b850b4e72f4ddaa49846f1ab18e8dfa1440dcf4eee3558514",
+        "lastblockhash" : "0xbb3e9b87836b12635e9bf1a922429c4bcd5136b41d9e5808dac8449058053fdf",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -406,7 +399,7 @@
     "refundSuicide50procentCap_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refundSuicide50procentCap_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -418,9 +411,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xf91e",
-                    "hash" : "0x3053298dc5602e5e580db5cbbd0dcb1a257e9a3374e7736cd5aa36681193c18b",
-                    "mixHash" : "0xd677fadfaefb0607088ca05949fd6f24cb1a5c21ee84dd09995c5b6005889891",
-                    "nonce" : "0x8039074049138321",
+                    "hash" : "0x294b1d0cd124455ca1e5ecf37fce4ee7be1739b3645c2fa95380d11ccb787c8b",
+                    "mixHash" : "0x438e7e4ba03baa4ff63da84d3a29c783b2415eda7023abb35b00f2a24b92da60",
+                    "nonce" : "0x6b42acbccedaf24e",
                     "number" : "0x01",
                     "parentHash" : "0xbdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86b",
                     "receiptTrie" : "0xfe6c263b8c0c67f290121fa77b7e8983d6822602e1054be14dfd1c0d13f37b49",
@@ -429,7 +422,7 @@
                     "transactionsTrie" : "0x152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cabaef80ba954eee56e0adc11c5c5a6978f2be108757ae2318364acc1cae8355a0152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0ba0fe6c263b8c0c67f290121fa77b7e8983d6822602e1054be14dfd1c0d13f37b49b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f91e8203e880a0d677fadfaefb0607088ca05949fd6f24cb1a5c21ee84dd09995c5b6005889891888039074049138321f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000001f41ba0ca6eed05ee408be0dd60eaf1be4ed39e132fca30191b5d29a1d539f62659ee2da07638bed28aa6eec9d1b8a1a8e96f3fdb7117b2b0412f0804b1cb2f3f3c4f4056c0",
+                "rlp" : "0xf9027ff901f7a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cabaef80ba954eee56e0adc11c5c5a6978f2be108757ae2318364acc1cae8355a0152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0ba0fe6c263b8c0c67f290121fa77b7e8983d6822602e1054be14dfd1c0d13f37b49b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082f91e8203e880a0438e7e4ba03baa4ff63da84d3a29c783b2415eda7023abb35b00f2a24b92da60886b42acbccedaf24ef882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000001f41ba0ca6eed05ee408be0dd60eaf1be4ed39e132fca30191b5d29a1d539f62659ee2da07638bed28aa6eec9d1b8a1a8e96f3fdb7117b2b0412f0804b1cb2f3f3c4f4056c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -466,7 +459,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b26249ae651a11898d83ff3824ce37f6ad82c7e5fb985cc974fba2d5b77d7fb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3053298dc5602e5e580db5cbbd0dcb1a257e9a3374e7736cd5aa36681193c18b",
+        "lastblockhash" : "0x294b1d0cd124455ca1e5ecf37fce4ee7be1739b3645c2fa95380d11ccb787c8b",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -536,7 +529,7 @@
     "refundSuicide50procentCap_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refundSuicide50procentCap_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -548,9 +541,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011427",
-                    "hash" : "0x2aa846c891a796cfe9799f2e86380180f8eadfd86e244df593662b20c24d7846",
-                    "mixHash" : "0x00a5e437042c35519f06d627abab68e330658c25f6a388c912e1a82f90c20002",
-                    "nonce" : "0x809a869f079556a4",
+                    "hash" : "0xb1759f52f8fd79e14fadb2689f71c0b6b783fb7601b8e2e4598dd03b7cb33646",
+                    "mixHash" : "0x56ec7415ed145936cb0e0d80bc866f95e83288b21ab9b75a84d9b7c63ae8f856",
+                    "nonce" : "0x0a868df327621c9e",
                     "number" : "0x01",
                     "parentHash" : "0xbdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86b",
                     "receiptTrie" : "0xf8ae7fa8d7b2d9440ee8bae82adef9727d2f9b9ea9eb63974fe52963db65b770",
@@ -559,7 +552,7 @@
                     "transactionsTrie" : "0x152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b53b6dc50ce7381679719eccbd86d0e1359b83b43ff401ff487cf5b5894e250fa0152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0ba0f8ae7fa8d7b2d9440ee8bae82adef9727d2f9b9ea9eb63974fe52963db65b770b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830114278203e880a000a5e437042c35519f06d627abab68e330658c25f6a388c912e1a82f90c2000288809a869f079556a4f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000001f41ba0ca6eed05ee408be0dd60eaf1be4ed39e132fca30191b5d29a1d539f62659ee2da07638bed28aa6eec9d1b8a1a8e96f3fdb7117b2b0412f0804b1cb2f3f3c4f4056c0",
+                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b53b6dc50ce7381679719eccbd86d0e1359b83b43ff401ff487cf5b5894e250fa0152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0ba0f8ae7fa8d7b2d9440ee8bae82adef9727d2f9b9ea9eb63974fe52963db65b770b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830114278203e880a056ec7415ed145936cb0e0d80bc866f95e83288b21ab9b75a84d9b7c63ae8f856880a868df327621c9ef882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000001f41ba0ca6eed05ee408be0dd60eaf1be4ed39e132fca30191b5d29a1d539f62659ee2da07638bed28aa6eec9d1b8a1a8e96f3fdb7117b2b0412f0804b1cb2f3f3c4f4056c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -596,7 +589,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b26249ae651a11898d83ff3824ce37f6ad82c7e5fb985cc974fba2d5b77d7fb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2aa846c891a796cfe9799f2e86380180f8eadfd86e244df593662b20c24d7846",
+        "lastblockhash" : "0xb1759f52f8fd79e14fadb2689f71c0b6b783fb7601b8e2e4598dd03b7cb33646",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -660,7 +653,7 @@
     "refundSuicide50procentCap_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refundSuicide50procentCap_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -672,9 +665,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011427",
-                    "hash" : "0x71a6d54d42dc7b279750e3ccf93e27ca79faabdad8350faed1aba70062c102f6",
-                    "mixHash" : "0xaa157c6219f589b499696cfa6fd3bd5599210ddd86993f5cca545e6d26afa26b",
-                    "nonce" : "0x16c089a21028d5d3",
+                    "hash" : "0x95df2dd3de1e9e0c193b4b661a3c9d904f59d6265ecc087e8acb91d4a9ff8030",
+                    "mixHash" : "0x0e9802136ae23df8420d88d0ba4e4efe42bf7a3756206555f7d60cc3289cce5c",
+                    "nonce" : "0xb6b1e74a2c3b77d7",
                     "number" : "0x01",
                     "parentHash" : "0xbdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86b",
                     "receiptTrie" : "0xf8ae7fa8d7b2d9440ee8bae82adef9727d2f9b9ea9eb63974fe52963db65b770",
@@ -683,7 +676,7 @@
                     "transactionsTrie" : "0x152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b53b6dc50ce7381679719eccbd86d0e1359b83b43ff401ff487cf5b5894e250fa0152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0ba0f8ae7fa8d7b2d9440ee8bae82adef9727d2f9b9ea9eb63974fe52963db65b770b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830114278203e880a0aa157c6219f589b499696cfa6fd3bd5599210ddd86993f5cca545e6d26afa26b8816c089a21028d5d3f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000001f41ba0ca6eed05ee408be0dd60eaf1be4ed39e132fca30191b5d29a1d539f62659ee2da07638bed28aa6eec9d1b8a1a8e96f3fdb7117b2b0412f0804b1cb2f3f3c4f4056c0",
+                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b53b6dc50ce7381679719eccbd86d0e1359b83b43ff401ff487cf5b5894e250fa0152ce708665da4f8b22d15f1b7f6d376eee2f93874a4d1f6272c5e657dbe1b0ba0f8ae7fa8d7b2d9440ee8bae82adef9727d2f9b9ea9eb63974fe52963db65b770b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830114278203e880a00e9802136ae23df8420d88d0ba4e4efe42bf7a3756206555f7d60cc3289cce5c88b6b1e74a2c3b77d7f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000001f41ba0ca6eed05ee408be0dd60eaf1be4ed39e132fca30191b5d29a1d539f62659ee2da07638bed28aa6eec9d1b8a1a8e96f3fdb7117b2b0412f0804b1cb2f3f3c4f4056c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -720,7 +713,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b26249ae651a11898d83ff3824ce37f6ad82c7e5fb985cc974fba2d5b77d7fb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x71a6d54d42dc7b279750e3ccf93e27ca79faabdad8350faed1aba70062c102f6",
+        "lastblockhash" : "0x95df2dd3de1e9e0c193b4b661a3c9d904f59d6265ecc087e8acb91d4a9ff8030",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refundSuicide50procentCap_d1g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refundSuicide50procentCap_d1g0v0.json
index 91b552e9c..133ea876c 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refundSuicide50procentCap_d1g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refundSuicide50procentCap_d1g0v0.json
@@ -2,7 +2,7 @@
     "refundSuicide50procentCap_d1g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refundSuicide50procentCap_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011f15",
-                    "hash" : "0x109118c08dbbcef735da96765b593238237852ed3dea8fcdd134fa5b2f6fcb75",
-                    "mixHash" : "0x0f6e571651e4b52fbb54d95f8ed16b08d6b532342e1976fb8000b4e868950f6b",
-                    "nonce" : "0x3efd6b53d1b18653",
+                    "hash" : "0x5675f1e0f5771117aae5d2011711a2535017daec093339e3f1a233be005a01e9",
+                    "mixHash" : "0xee1bcd49fa2b9861224504a70ac60597f44872f15e02f272563581af8c34f2a7",
+                    "nonce" : "0x7eceea665868928b",
                     "number" : "0x01",
                     "parentHash" : "0xbdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86b",
                     "receiptTrie" : "0xc7c04a8e5b16405fd32719819511ef3ab1eabd23cf0b16d382664a32773c5992",
-                    "stateRoot" : "0xc572a8418806a9579adecaaab85fa0a3a388bde4a770a5f9e7c57536153655f9",
+                    "stateRoot" : "0xc0ffe9e82f6468451ebc0ac388c463506de7b50ddadece0c711996b1df6bef48",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c572a8418806a9579adecaaab85fa0a3a388bde4a770a5f9e7c57536153655f9a08126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810a0c7c04a8e5b16405fd32719819511ef3ab1eabd23cf0b16d382664a32773c5992b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011f158203e880a00f6e571651e4b52fbb54d95f8ed16b08d6b532342e1976fb8000b4e868950f6b883efd6b53d1b18653f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000100001ca0f7999e1c73e1c97b1f50c47c01c2e4b7e373d7f7c283212b4384cce240f5b61fa07194855dd81cab147aaefecbcad9ae4af1fd2955975afb6a8b42d8c12a4cd215c0",
+                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c0ffe9e82f6468451ebc0ac388c463506de7b50ddadece0c711996b1df6bef48a08126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810a0c7c04a8e5b16405fd32719819511ef3ab1eabd23cf0b16d382664a32773c5992b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011f158203e880a0ee1bcd49fa2b9861224504a70ac60597f44872f15e02f272563581af8c34f2a7887eceea665868928bf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000100001ca0f7999e1c73e1c97b1f50c47c01c2e4b7e373d7f7c283212b4384cce240f5b61fa07194855dd81cab147aaefecbcad9ae4af1fd2955975afb6a8b42d8c12a4cd215c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b26249ae651a11898d83ff3824ce37f6ad82c7e5fb985cc974fba2d5b77d7fb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x109118c08dbbcef735da96765b593238237852ed3dea8fcdd134fa5b2f6fcb75",
+        "lastblockhash" : "0x5675f1e0f5771117aae5d2011711a2535017daec093339e3f1a233be005a01e9",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec80000",
                 "code" : "0x5a6016556001600a556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600b55600060015560006002556000600355600060045560006005556000600655600060075560006008555a601755",
@@ -84,7 +77,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51f15",
+                "balance" : "0x29a2241af62d1f15",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -133,7 +126,7 @@
     "refundSuicide50procentCap_d1g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refundSuicide50procentCap_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -145,18 +138,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011f15",
-                    "hash" : "0x7fe0c9333b314cbfb61096f9228dc31e314ec16a3aafd6b630a6f566eb354bb2",
-                    "mixHash" : "0x3615f04de3d63c022ddf9bc4f9d0ebf905fdf7dc3962bfabbaa3a6e02ada86ea",
-                    "nonce" : "0x80b3d34645ee4b45",
+                    "hash" : "0x6fc4d7ef24c91fd01c012f289237e51dead68633b53fab42abe75b7eb6fee6f2",
+                    "mixHash" : "0x4167a090c71b100246570c3b94b278ad0af9a0921922511ef7bf5579d4ca022b",
+                    "nonce" : "0x3c9ec17aa52794b4",
                     "number" : "0x01",
                     "parentHash" : "0xbdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86b",
                     "receiptTrie" : "0xc7c04a8e5b16405fd32719819511ef3ab1eabd23cf0b16d382664a32773c5992",
-                    "stateRoot" : "0xc572a8418806a9579adecaaab85fa0a3a388bde4a770a5f9e7c57536153655f9",
+                    "stateRoot" : "0x8d745e8614320f0b3442d05eedbdae83158eab193d6c18a16e7e9276b44e9b85",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x8126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c572a8418806a9579adecaaab85fa0a3a388bde4a770a5f9e7c57536153655f9a08126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810a0c7c04a8e5b16405fd32719819511ef3ab1eabd23cf0b16d382664a32773c5992b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011f158203e880a03615f04de3d63c022ddf9bc4f9d0ebf905fdf7dc3962bfabbaa3a6e02ada86ea8880b3d34645ee4b45f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000100001ca0f7999e1c73e1c97b1f50c47c01c2e4b7e373d7f7c283212b4384cce240f5b61fa07194855dd81cab147aaefecbcad9ae4af1fd2955975afb6a8b42d8c12a4cd215c0",
+                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d745e8614320f0b3442d05eedbdae83158eab193d6c18a16e7e9276b44e9b85a08126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810a0c7c04a8e5b16405fd32719819511ef3ab1eabd23cf0b16d382664a32773c5992b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011f158203e880a04167a090c71b100246570c3b94b278ad0af9a0921922511ef7bf5579d4ca022b883c9ec17aa52794b4f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000100001ca0f7999e1c73e1c97b1f50c47c01c2e4b7e373d7f7c283212b4384cce240f5b61fa07194855dd81cab147aaefecbcad9ae4af1fd2955975afb6a8b42d8c12a4cd215c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -193,7 +186,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b26249ae651a11898d83ff3824ce37f6ad82c7e5fb985cc974fba2d5b77d7fb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7fe0c9333b314cbfb61096f9228dc31e314ec16a3aafd6b630a6f566eb354bb2",
+        "lastblockhash" : "0x6fc4d7ef24c91fd01c012f289237e51dead68633b53fab42abe75b7eb6fee6f2",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -215,7 +208,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f51f15",
+                "balance" : "0x29a2241af62d1f15",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -264,7 +257,7 @@
     "refundSuicide50procentCap_d1g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refundSuicide50procentCap_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -276,9 +269,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011f15",
-                    "hash" : "0x2494cfb87254ae6acf2ccb1782a939393c798d47dc956cfe2691c7e65a1ee584",
-                    "mixHash" : "0x94f695ba0887b510823a897560b89000fac15f827c7d7da56197ca083cec8382",
-                    "nonce" : "0x69e970eded5c7706",
+                    "hash" : "0x21800361ecf08140d018b5a2b2531c5e5f7a277c337e0920a4388cdf4120fe8f",
+                    "mixHash" : "0xe90a0c7f70dde39c2d36cef9d20c2df53cc42da4ab8ad617e25dcb1eb785388d",
+                    "nonce" : "0xd217a7991f222209",
                     "number" : "0x01",
                     "parentHash" : "0xbdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86b",
                     "receiptTrie" : "0x30ebdbbdea9639413bf1689f17a99ce2e0e54bf6b917fcb7a5898837bec6a0ac",
@@ -287,7 +280,7 @@
                     "transactionsTrie" : "0x8126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051f0157a0b69cc801518d78aa12b826f6889d147ee5f69946d5103a7ddb6c833a08126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810a030ebdbbdea9639413bf1689f17a99ce2e0e54bf6b917fcb7a5898837bec6a0acb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011f158203e880a094f695ba0887b510823a897560b89000fac15f827c7d7da56197ca083cec83828869e970eded5c7706f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000100001ca0f7999e1c73e1c97b1f50c47c01c2e4b7e373d7f7c283212b4384cce240f5b61fa07194855dd81cab147aaefecbcad9ae4af1fd2955975afb6a8b42d8c12a4cd215c0",
+                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051f0157a0b69cc801518d78aa12b826f6889d147ee5f69946d5103a7ddb6c833a08126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810a030ebdbbdea9639413bf1689f17a99ce2e0e54bf6b917fcb7a5898837bec6a0acb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011f158203e880a0e90a0c7f70dde39c2d36cef9d20c2df53cc42da4ab8ad617e25dcb1eb785388d88d217a7991f222209f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000100001ca0f7999e1c73e1c97b1f50c47c01c2e4b7e373d7f7c283212b4384cce240f5b61fa07194855dd81cab147aaefecbcad9ae4af1fd2955975afb6a8b42d8c12a4cd215c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -324,7 +317,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b26249ae651a11898d83ff3824ce37f6ad82c7e5fb985cc974fba2d5b77d7fb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2494cfb87254ae6acf2ccb1782a939393c798d47dc956cfe2691c7e65a1ee584",
+        "lastblockhash" : "0x21800361ecf08140d018b5a2b2531c5e5f7a277c337e0920a4388cdf4120fe8f",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -388,7 +381,7 @@
     "refundSuicide50procentCap_d1g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refundSuicide50procentCap_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -400,9 +393,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011f15",
-                    "hash" : "0xa6bef053f88296f95914d09eedbe43bd727381f21b0fe6298d9c6a3c590f6fb6",
-                    "mixHash" : "0x2f10f754178602c4cc813ae0902a39be2114a1d62c0ec740c168293506f6051c",
-                    "nonce" : "0xe41864c161d8d6fc",
+                    "hash" : "0xa4bc750c453c4820f63bd63f4ad949157ac8c2129b159786763d206068b28904",
+                    "mixHash" : "0xc4b59119c1f3bd09832aec73d7eba544ac890a7a0254e3f3ece49aeecc14762c",
+                    "nonce" : "0x06f501c147800ed9",
                     "number" : "0x01",
                     "parentHash" : "0xbdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86b",
                     "receiptTrie" : "0x30ebdbbdea9639413bf1689f17a99ce2e0e54bf6b917fcb7a5898837bec6a0ac",
@@ -411,7 +404,7 @@
                     "transactionsTrie" : "0x8126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051f0157a0b69cc801518d78aa12b826f6889d147ee5f69946d5103a7ddb6c833a08126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810a030ebdbbdea9639413bf1689f17a99ce2e0e54bf6b917fcb7a5898837bec6a0acb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011f158203e880a02f10f754178602c4cc813ae0902a39be2114a1d62c0ec740c168293506f6051c88e41864c161d8d6fcf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000100001ca0f7999e1c73e1c97b1f50c47c01c2e4b7e373d7f7c283212b4384cce240f5b61fa07194855dd81cab147aaefecbcad9ae4af1fd2955975afb6a8b42d8c12a4cd215c0",
+                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051f0157a0b69cc801518d78aa12b826f6889d147ee5f69946d5103a7ddb6c833a08126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810a030ebdbbdea9639413bf1689f17a99ce2e0e54bf6b917fcb7a5898837bec6a0acb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083011f158203e880a0c4b59119c1f3bd09832aec73d7eba544ac890a7a0254e3f3ece49aeecc14762c8806f501c147800ed9f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000100001ca0f7999e1c73e1c97b1f50c47c01c2e4b7e373d7f7c283212b4384cce240f5b61fa07194855dd81cab147aaefecbcad9ae4af1fd2955975afb6a8b42d8c12a4cd215c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -448,7 +441,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b26249ae651a11898d83ff3824ce37f6ad82c7e5fb985cc974fba2d5b77d7fb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa6bef053f88296f95914d09eedbe43bd727381f21b0fe6298d9c6a3c590f6fb6",
+        "lastblockhash" : "0xa4bc750c453c4820f63bd63f4ad949157ac8c2129b159786763d206068b28904",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -512,7 +505,7 @@
     "refundSuicide50procentCap_d1g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refundSuicide50procentCap_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -524,9 +517,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011407",
-                    "hash" : "0x8d9f6a7b7442a93813ad67ef07d9ec332d7bfc2595d4b37dff64d219efb777b5",
-                    "mixHash" : "0xb7385f77ae753129933f6d9673069a93d708fe9738bf2e59887c9c3e32c037b0",
-                    "nonce" : "0xe429b6393cf283dc",
+                    "hash" : "0x13cca72ce85d2967a6701bcb9214b991b74046117da46017a814075e8ead3f09",
+                    "mixHash" : "0x70a289c1de8a6da1068f3d47dad8dadfaea9785b3228e1d8a472a484d9a974cc",
+                    "nonce" : "0x91c1d4fdb5ef7eb5",
                     "number" : "0x01",
                     "parentHash" : "0xbdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86b",
                     "receiptTrie" : "0xd5a1184a539450952f2d978df323d8c5deab2f3d971f016f9c029a9c3333f07d",
@@ -535,7 +528,7 @@
                     "transactionsTrie" : "0x8126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff6bf8d9014efdc103cca37da561f6d872a79fc63d2801ecf0eef5468ef641c1a08126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810a0d5a1184a539450952f2d978df323d8c5deab2f3d971f016f9c029a9c3333f07db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830114078203e880a0b7385f77ae753129933f6d9673069a93d708fe9738bf2e59887c9c3e32c037b088e429b6393cf283dcf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000100001ca0f7999e1c73e1c97b1f50c47c01c2e4b7e373d7f7c283212b4384cce240f5b61fa07194855dd81cab147aaefecbcad9ae4af1fd2955975afb6a8b42d8c12a4cd215c0",
+                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff6bf8d9014efdc103cca37da561f6d872a79fc63d2801ecf0eef5468ef641c1a08126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810a0d5a1184a539450952f2d978df323d8c5deab2f3d971f016f9c029a9c3333f07db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830114078203e880a070a289c1de8a6da1068f3d47dad8dadfaea9785b3228e1d8a472a484d9a974cc8891c1d4fdb5ef7eb5f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000100001ca0f7999e1c73e1c97b1f50c47c01c2e4b7e373d7f7c283212b4384cce240f5b61fa07194855dd81cab147aaefecbcad9ae4af1fd2955975afb6a8b42d8c12a4cd215c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -572,7 +565,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b26249ae651a11898d83ff3824ce37f6ad82c7e5fb985cc974fba2d5b77d7fb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8d9f6a7b7442a93813ad67ef07d9ec332d7bfc2595d4b37dff64d219efb777b5",
+        "lastblockhash" : "0x13cca72ce85d2967a6701bcb9214b991b74046117da46017a814075e8ead3f09",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -636,7 +629,7 @@
     "refundSuicide50procentCap_d1g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refundSuicide50procentCap_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -648,9 +641,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x011407",
-                    "hash" : "0xd9cbf773d7afaa403930160f36d5fcc6e6f4d1839d2d44d70946537e0cb7d619",
-                    "mixHash" : "0x7344318cbbb3c7f314b1183b3b95cd95a4cfcdc7a34a1d66a38a7f53a5b2cdc6",
-                    "nonce" : "0x8c601316b5517da3",
+                    "hash" : "0xd088c895115db8c5bdac54a942383020571b2f2ad94496df9032a5d44bc7b13f",
+                    "mixHash" : "0xb96b35f61572724da36b4529c26a15f72679c317b61b6e9d8ebe0cb2c8736718",
+                    "nonce" : "0xb0f0781985ce29a7",
                     "number" : "0x01",
                     "parentHash" : "0xbdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86b",
                     "receiptTrie" : "0xd5a1184a539450952f2d978df323d8c5deab2f3d971f016f9c029a9c3333f07d",
@@ -659,7 +652,7 @@
                     "transactionsTrie" : "0x8126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff6bf8d9014efdc103cca37da561f6d872a79fc63d2801ecf0eef5468ef641c1a08126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810a0d5a1184a539450952f2d978df323d8c5deab2f3d971f016f9c029a9c3333f07db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830114078203e880a07344318cbbb3c7f314b1183b3b95cd95a4cfcdc7a34a1d66a38a7f53a5b2cdc6888c601316b5517da3f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000100001ca0f7999e1c73e1c97b1f50c47c01c2e4b7e373d7f7c283212b4384cce240f5b61fa07194855dd81cab147aaefecbcad9ae4af1fd2955975afb6a8b42d8c12a4cd215c0",
+                "rlp" : "0xf90280f901f8a0bdd5b66ebee4e8072f6211c79f81162b597ab68bb81d9b2274e7a3656da3f86ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ff6bf8d9014efdc103cca37da561f6d872a79fc63d2801ecf0eef5468ef641c1a08126dc7596f9071315e97337ede1e7484c48a8cdc17bc70bba57bccaad9ee810a0d5a1184a539450952f2d978df323d8c5deab2f3d971f016f9c029a9c3333f07db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830114078203e880a0b96b35f61572724da36b4529c26a15f72679c317b61b6e9d8ebe0cb2c873671888b0f0781985ce29a7f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d8780a000000000000000000000000000000000000000000000000000000000000100001ca0f7999e1c73e1c97b1f50c47c01c2e4b7e373d7f7c283212b4384cce240f5b61fa07194855dd81cab147aaefecbcad9ae4af1fd2955975afb6a8b42d8c12a4cd215c0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -696,7 +689,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b26249ae651a11898d83ff3824ce37f6ad82c7e5fb985cc974fba2d5b77d7fb6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd9cbf773d7afaa403930160f36d5fcc6e6f4d1839d2d44d70946537e0cb7d619",
+        "lastblockhash" : "0xd088c895115db8c5bdac54a942383020571b2f2ad94496df9032a5d44bc7b13f",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallA_OOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallA_OOG_d0g0v0.json
index 9ba199da9..ec2eb6f0e 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallA_OOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallA_OOG_d0g0v0.json
@@ -2,7 +2,7 @@
     "refund_CallA_OOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x795d",
-                    "hash" : "0x75a95a8158b69781916ffa474e539a073f0cf322d05bd487ecfc6a65c18accbb",
-                    "mixHash" : "0x8e7cec9f1b7d38a58715ce0aa7dc1358993f8d199c20a1ea357e148bc7cb53f3",
-                    "nonce" : "0x72dcb0b4d895da5e",
+                    "hash" : "0xce9dba4eab20eb5b970dd0271a21e4a457895017dba4d50956e19e56875cd2c8",
+                    "mixHash" : "0xefdc4db8faa9520b32c8c2591cc53045766849eb3d27026883fed2c5c7318fcb",
+                    "nonce" : "0x3ed8fe07e067f9f0",
                     "number" : "0x01",
                     "parentHash" : "0xf33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831",
                     "receiptTrie" : "0x71ebbcdbbf242687cad1bcf857b8c155171aa2a89f4eecf0279f1c03fa66434b",
-                    "stateRoot" : "0x1b5b38792fc3ab59b66f95b679c733d4b7c2981e757038c4e77257d16b6971c2",
+                    "stateRoot" : "0xdb711415b05bd03fbc6a52c0c1b0c73c6728dc7da72059392d1a08640a804636",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xfc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5b38792fc3ab59b66f95b679c733d4b7c2981e757038c4e77257d16b6971c2a0fc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667ba071ebbcdbbf242687cad1bcf857b8c155171aa2a89f4eecf0279f1c03fa66434bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a08e7cec9f1b7d38a58715ce0aa7dc1358993f8d199c20a1ea357e148bc7cb53f38872dcb0b4d895da5ef861f85f800182795d94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca07e7cfb9acb7c877739c6991c421e966dcea25fd6f3e915d51f9633d6beb17d7ca02b075bcffec6f5566c35d12679d284ae464ae45f4adc5ea8f9319d6fe10d5df2c0",
+                "rlp" : "0xf9025ef901f7a0f33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0db711415b05bd03fbc6a52c0c1b0c73c6728dc7da72059392d1a08640a804636a0fc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667ba071ebbcdbbf242687cad1bcf857b8c155171aa2a89f4eecf0279f1c03fa66434bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a0efdc4db8faa9520b32c8c2591cc53045766849eb3d27026883fed2c5c7318fcb883ed8fe07e067f9f0f861f85f800182795d94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca07e7cfb9acb7c877739c6991c421e966dcea25fd6f3e915d51f9633d6beb17d7ca02b075bcffec6f5566c35d12679d284ae464ae45f4adc5ea8f9319d6fe10d5df2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e696a428f97033072cba3c1013e6410f104f7e3ae212306538230e69e2c543a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x75a95a8158b69781916ffa474e539a073f0cf322d05bd487ecfc6a65c18accbb",
+        "lastblockhash" : "0xce9dba4eab20eb5b970dd0271a21e4a457895017dba4d50956e19e56875cd2c8",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa611770f1600055",
@@ -81,7 +74,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4795d",
+                "balance" : "0x29a2241af62c795d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -132,7 +125,7 @@
     "refund_CallA_OOG_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -144,18 +137,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x795d",
-                    "hash" : "0x4af19846cc361b42d0f16a57c124840b3d69ca6ecd9c6c2006c59bd2b8aa080c",
-                    "mixHash" : "0x7136c43589ea2737969c406cd3d311f097e55321da0f161354b9cd0889e86a06",
-                    "nonce" : "0x26cd085f501b633d",
+                    "hash" : "0xf5e9c8ea995b0dc0a8d88cd7f7a4555829af5d3b8c16ff44abcdd6a25a77b7b4",
+                    "mixHash" : "0x6e594519e4f450d07bfae856073ed9859b71711bba8773bb96475c420c064aff",
+                    "nonce" : "0x2b7c68e96452234a",
                     "number" : "0x01",
                     "parentHash" : "0xf33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831",
                     "receiptTrie" : "0x71ebbcdbbf242687cad1bcf857b8c155171aa2a89f4eecf0279f1c03fa66434b",
-                    "stateRoot" : "0x1b5b38792fc3ab59b66f95b679c733d4b7c2981e757038c4e77257d16b6971c2",
+                    "stateRoot" : "0xa44c565316697dfa5242d54e755fdab75831dcb6d7e1cf48a59b23d18876d2a1",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xfc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5b38792fc3ab59b66f95b679c733d4b7c2981e757038c4e77257d16b6971c2a0fc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667ba071ebbcdbbf242687cad1bcf857b8c155171aa2a89f4eecf0279f1c03fa66434bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a07136c43589ea2737969c406cd3d311f097e55321da0f161354b9cd0889e86a068826cd085f501b633df861f85f800182795d94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca07e7cfb9acb7c877739c6991c421e966dcea25fd6f3e915d51f9633d6beb17d7ca02b075bcffec6f5566c35d12679d284ae464ae45f4adc5ea8f9319d6fe10d5df2c0",
+                "rlp" : "0xf9025ef901f7a0f33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a44c565316697dfa5242d54e755fdab75831dcb6d7e1cf48a59b23d18876d2a1a0fc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667ba071ebbcdbbf242687cad1bcf857b8c155171aa2a89f4eecf0279f1c03fa66434bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a06e594519e4f450d07bfae856073ed9859b71711bba8773bb96475c420c064aff882b7c68e96452234af861f85f800182795d94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca07e7cfb9acb7c877739c6991c421e966dcea25fd6f3e915d51f9633d6beb17d7ca02b075bcffec6f5566c35d12679d284ae464ae45f4adc5ea8f9319d6fe10d5df2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -192,7 +185,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e696a428f97033072cba3c1013e6410f104f7e3ae212306538230e69e2c543a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4af19846cc361b42d0f16a57c124840b3d69ca6ecd9c6c2006c59bd2b8aa080c",
+        "lastblockhash" : "0xf5e9c8ea995b0dc0a8d88cd7f7a4555829af5d3b8c16ff44abcdd6a25a77b7b4",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -211,7 +204,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4795d",
+                "balance" : "0x29a2241af62c795d",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -262,7 +255,7 @@
     "refund_CallA_OOG_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -274,9 +267,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x795d",
-                    "hash" : "0xca629c9342c0114593e56156078f39df77104ddbec28934260ff22d11cb4e616",
-                    "mixHash" : "0x05037a79c26e0984c0a6183f67fa070605ca65048355d32749481b61d27d0219",
-                    "nonce" : "0xcd2b86ec9ae304fe",
+                    "hash" : "0xcf5eccad2c2cccce753a6386df698e945fdbec2ec0950335d8a9882a89670eee",
+                    "mixHash" : "0xa57286d4a1670fa685da87a3274617aaca81c9919fb224538c4cd24416788236",
+                    "nonce" : "0xe9a95835a65acac0",
                     "number" : "0x01",
                     "parentHash" : "0xf33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831",
                     "receiptTrie" : "0x6c7f0aa97089212f779520348e654b541353e552bfb4b2d3e070247c12386311",
@@ -285,7 +278,7 @@
                     "transactionsTrie" : "0xfc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0025413d798caf6577f2c8cce174f9d981789cbc5ebcbfb6690aa189aad8f2826a0fc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667ba06c7f0aa97089212f779520348e654b541353e552bfb4b2d3e070247c12386311b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a005037a79c26e0984c0a6183f67fa070605ca65048355d32749481b61d27d021988cd2b86ec9ae304fef861f85f800182795d94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca07e7cfb9acb7c877739c6991c421e966dcea25fd6f3e915d51f9633d6beb17d7ca02b075bcffec6f5566c35d12679d284ae464ae45f4adc5ea8f9319d6fe10d5df2c0",
+                "rlp" : "0xf9025ef901f7a0f33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0025413d798caf6577f2c8cce174f9d981789cbc5ebcbfb6690aa189aad8f2826a0fc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667ba06c7f0aa97089212f779520348e654b541353e552bfb4b2d3e070247c12386311b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a0a57286d4a1670fa685da87a3274617aaca81c9919fb224538c4cd2441678823688e9a95835a65acac0f861f85f800182795d94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca07e7cfb9acb7c877739c6991c421e966dcea25fd6f3e915d51f9633d6beb17d7ca02b075bcffec6f5566c35d12679d284ae464ae45f4adc5ea8f9319d6fe10d5df2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -322,7 +315,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e696a428f97033072cba3c1013e6410f104f7e3ae212306538230e69e2c543a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xca629c9342c0114593e56156078f39df77104ddbec28934260ff22d11cb4e616",
+        "lastblockhash" : "0xcf5eccad2c2cccce753a6386df698e945fdbec2ec0950335d8a9882a89670eee",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -385,7 +378,7 @@
     "refund_CallA_OOG_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -397,9 +390,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x795d",
-                    "hash" : "0x8b5b43215828371769bc9acd4cbd770b03abffaa8a5de4fa51cd6f5ab75dbc10",
-                    "mixHash" : "0x9e772916b860e726fba896bdc98f1082bd76401f66824efc05d991a612e2b5dc",
-                    "nonce" : "0xe1cf2d2c1f86c154",
+                    "hash" : "0x81050cc7c25b044489b05bb34cc1b46bfc02837096667588d7c21d910165cf99",
+                    "mixHash" : "0x39c7be5435059d334edfc0011a743fd35160efa4f81b42ccdb4570a9569fc731",
+                    "nonce" : "0xddbef91bc2c46807",
                     "number" : "0x01",
                     "parentHash" : "0xf33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831",
                     "receiptTrie" : "0x6c7f0aa97089212f779520348e654b541353e552bfb4b2d3e070247c12386311",
@@ -408,7 +401,7 @@
                     "transactionsTrie" : "0xfc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0025413d798caf6577f2c8cce174f9d981789cbc5ebcbfb6690aa189aad8f2826a0fc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667ba06c7f0aa97089212f779520348e654b541353e552bfb4b2d3e070247c12386311b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a09e772916b860e726fba896bdc98f1082bd76401f66824efc05d991a612e2b5dc88e1cf2d2c1f86c154f861f85f800182795d94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca07e7cfb9acb7c877739c6991c421e966dcea25fd6f3e915d51f9633d6beb17d7ca02b075bcffec6f5566c35d12679d284ae464ae45f4adc5ea8f9319d6fe10d5df2c0",
+                "rlp" : "0xf9025ef901f7a0f33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0025413d798caf6577f2c8cce174f9d981789cbc5ebcbfb6690aa189aad8f2826a0fc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667ba06c7f0aa97089212f779520348e654b541353e552bfb4b2d3e070247c12386311b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a039c7be5435059d334edfc0011a743fd35160efa4f81b42ccdb4570a9569fc73188ddbef91bc2c46807f861f85f800182795d94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca07e7cfb9acb7c877739c6991c421e966dcea25fd6f3e915d51f9633d6beb17d7ca02b075bcffec6f5566c35d12679d284ae464ae45f4adc5ea8f9319d6fe10d5df2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -445,7 +438,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e696a428f97033072cba3c1013e6410f104f7e3ae212306538230e69e2c543a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8b5b43215828371769bc9acd4cbd770b03abffaa8a5de4fa51cd6f5ab75dbc10",
+        "lastblockhash" : "0x81050cc7c25b044489b05bb34cc1b46bfc02837096667588d7c21d910165cf99",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -508,7 +501,7 @@
     "refund_CallA_OOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -520,9 +513,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x795d",
-                    "hash" : "0xd172bcaefcd66fd49e8291740904cdd47f14d87a14f23204ae36cc59483ad55e",
-                    "mixHash" : "0xf5131deee4505fb484e8dfb2267090adec0f8b3d1aec8ff0e408aad879c1dcc0",
-                    "nonce" : "0x8f62e4a647d6ce45",
+                    "hash" : "0x73fc4fee6553a8243df4e0770b3cc668fe3a826a446acdfa268b068e1623d533",
+                    "mixHash" : "0x86fba3d9dd78c076e682ad7e4dce27338d3dfab61cefe01b2de63e23fa1a01a7",
+                    "nonce" : "0x9b3a2401f112b312",
                     "number" : "0x01",
                     "parentHash" : "0xf33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831",
                     "receiptTrie" : "0x6c7f0aa97089212f779520348e654b541353e552bfb4b2d3e070247c12386311",
@@ -531,7 +524,7 @@
                     "transactionsTrie" : "0xfc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0025413d798caf6577f2c8cce174f9d981789cbc5ebcbfb6690aa189aad8f2826a0fc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667ba06c7f0aa97089212f779520348e654b541353e552bfb4b2d3e070247c12386311b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a0f5131deee4505fb484e8dfb2267090adec0f8b3d1aec8ff0e408aad879c1dcc0888f62e4a647d6ce45f861f85f800182795d94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca07e7cfb9acb7c877739c6991c421e966dcea25fd6f3e915d51f9633d6beb17d7ca02b075bcffec6f5566c35d12679d284ae464ae45f4adc5ea8f9319d6fe10d5df2c0",
+                "rlp" : "0xf9025ef901f7a0f33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0025413d798caf6577f2c8cce174f9d981789cbc5ebcbfb6690aa189aad8f2826a0fc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667ba06c7f0aa97089212f779520348e654b541353e552bfb4b2d3e070247c12386311b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a086fba3d9dd78c076e682ad7e4dce27338d3dfab61cefe01b2de63e23fa1a01a7889b3a2401f112b312f861f85f800182795d94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca07e7cfb9acb7c877739c6991c421e966dcea25fd6f3e915d51f9633d6beb17d7ca02b075bcffec6f5566c35d12679d284ae464ae45f4adc5ea8f9319d6fe10d5df2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -568,7 +561,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e696a428f97033072cba3c1013e6410f104f7e3ae212306538230e69e2c543a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd172bcaefcd66fd49e8291740904cdd47f14d87a14f23204ae36cc59483ad55e",
+        "lastblockhash" : "0x73fc4fee6553a8243df4e0770b3cc668fe3a826a446acdfa268b068e1623d533",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -631,7 +624,7 @@
     "refund_CallA_OOG_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -643,9 +636,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x795d",
-                    "hash" : "0xcc2cd74f79f4a011b197f743b0c5254011d55f820ec444bbdd81896dbd6acf42",
-                    "mixHash" : "0xd75371a6abb8257c603feabf4b5fdd522c98186db0a29e096d57abb049ca96f3",
-                    "nonce" : "0xdec04915d129e0e8",
+                    "hash" : "0xb08468295904dfcc06bb1b4ebd1c797c2bfcfc5d14733435e94cfe8ca7ecdcd5",
+                    "mixHash" : "0x119ebf1ee6d8c95f31d7af2b108135d39071b016fe2f7938ddcd1b2de8e2f1c1",
+                    "nonce" : "0x9ba45d9cde735b08",
                     "number" : "0x01",
                     "parentHash" : "0xf33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831",
                     "receiptTrie" : "0x6c7f0aa97089212f779520348e654b541353e552bfb4b2d3e070247c12386311",
@@ -654,7 +647,7 @@
                     "transactionsTrie" : "0xfc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0025413d798caf6577f2c8cce174f9d981789cbc5ebcbfb6690aa189aad8f2826a0fc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667ba06c7f0aa97089212f779520348e654b541353e552bfb4b2d3e070247c12386311b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a0d75371a6abb8257c603feabf4b5fdd522c98186db0a29e096d57abb049ca96f388dec04915d129e0e8f861f85f800182795d94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca07e7cfb9acb7c877739c6991c421e966dcea25fd6f3e915d51f9633d6beb17d7ca02b075bcffec6f5566c35d12679d284ae464ae45f4adc5ea8f9319d6fe10d5df2c0",
+                "rlp" : "0xf9025ef901f7a0f33bb0f77843a1edff6ed470d199fe56b457159382510ce572950fa7a7bd4831a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0025413d798caf6577f2c8cce174f9d981789cbc5ebcbfb6690aa189aad8f2826a0fc49029d71fbfc22e29aa0f7258a2d043884bbaa236c2816f91b9c54c47c667ba06c7f0aa97089212f779520348e654b541353e552bfb4b2d3e070247c12386311b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a0119ebf1ee6d8c95f31d7af2b108135d39071b016fe2f7938ddcd1b2de8e2f1c1889ba45d9cde735b08f861f85f800182795d94095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca07e7cfb9acb7c877739c6991c421e966dcea25fd6f3e915d51f9633d6beb17d7ca02b075bcffec6f5566c35d12679d284ae464ae45f4adc5ea8f9319d6fe10d5df2c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -691,7 +684,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a3e696a428f97033072cba3c1013e6410f104f7e3ae212306538230e69e2c543a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcc2cd74f79f4a011b197f743b0c5254011d55f820ec444bbdd81896dbd6acf42",
+        "lastblockhash" : "0xb08468295904dfcc06bb1b4ebd1c797c2bfcfc5d14733435e94cfe8ca7ecdcd5",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallA_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallA_d0g0v0.json
index 66d5a3a8c..4b2d47617 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallA_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallA_d0g0v0.json
@@ -2,7 +2,7 @@
     "refund_CallA_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x7bf2",
-                    "hash" : "0x00ead98c5a6c149f38e8fe49d85384b50a9491167f679f1c5d8a406fc7dc7234",
-                    "mixHash" : "0x9b3aad8ba3f2bd95e876ee9fae57517bd594f42895ed489187977afd2524cd98",
-                    "nonce" : "0xfb578a709718c2f7",
+                    "hash" : "0x2eb39d73b6b98d75e227ca9a0616ad98f3f1ec10c612bcb370be41e22cf9e492",
+                    "mixHash" : "0x4e8ccc79778fa86d220635398756575fe033f431cf44a6b689d6fff35005dd1f",
+                    "nonce" : "0xf34746d812b3b7dc",
                     "number" : "0x01",
                     "parentHash" : "0x417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953",
                     "receiptTrie" : "0x089f0c9e29a7ce65e0d065a95e6b18f035d5b9060e68f3909bc5270ce221f19b",
-                    "stateRoot" : "0xd748aabb62702c9be173876658e3814298de8ece927fafee870d8f0ff1e42c37",
+                    "stateRoot" : "0x3bba8760636ed44aef3c593cb5b93dc20caa43045d7d537a53b1bcab53d3bda6",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d748aabb62702c9be173876658e3814298de8ece927fafee870d8f0ff1e42c37a0695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655ba0089f0c9e29a7ce65e0d065a95e6b18f035d5b9060e68f3909bc5270ce221f19bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf28203e880a09b3aad8ba3f2bd95e876ee9fae57517bd594f42895ed489187977afd2524cd9888fb578a709718c2f7f862f860800183030d4094095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca0c65220d22ee9533e69ca0cca4f2d90dbabd0db71e86883dda79a6135a896c6c2a0148c872a3758db30e6cff63d5f8c1155bdf13d9a39bf993b42d3f2cc7a0c568ac0",
+                "rlp" : "0xf9025ff901f7a0417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03bba8760636ed44aef3c593cb5b93dc20caa43045d7d537a53b1bcab53d3bda6a0695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655ba0089f0c9e29a7ce65e0d065a95e6b18f035d5b9060e68f3909bc5270ce221f19bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf28203e880a04e8ccc79778fa86d220635398756575fe033f431cf44a6b689d6fff35005dd1f88f34746d812b3b7dcf862f860800183030d4094095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca0c65220d22ee9533e69ca0cca4f2d90dbabd0db71e86883dda79a6135a896c6c2a0148c872a3758db30e6cff63d5f8c1155bdf13d9a39bf993b42d3f2cc7a0c568ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa068ac7c65a3a31b7d8be621d99d2f227701585de873dbdaa2b5f8d74be15af1b2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x00ead98c5a6c149f38e8fe49d85384b50a9491167f679f1c5d8a406fc7dc7234",
+        "lastblockhash" : "0x2eb39d73b6b98d75e227ca9a0616ad98f3f1ec10c612bcb370be41e22cf9e492",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa61157cf1600055",
@@ -82,7 +75,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f47bf2",
+                "balance" : "0x29a2241af62c7bf2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -132,7 +125,7 @@
     "refund_CallA_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -144,18 +137,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x7bf2",
-                    "hash" : "0xd53b2788cd645fa2bea2441e94946e5c8e1af8ce50522722a0f55590242c6611",
-                    "mixHash" : "0x0c8b5cfb7dbe1ceb7ee235574201bf80b711e250a81327387f13557ef52d5d88",
-                    "nonce" : "0x673419ccc3f69a7b",
+                    "hash" : "0x713d72ba2fde4089a113dd3ceabf32fe4e2514bc4901e8fa12313cba6c55470d",
+                    "mixHash" : "0x92f67e51f1e1fde3135e2585d9dbfa5858cad2c07ab92675dbabbbdec93bf418",
+                    "nonce" : "0xf4e67e6ac72959b2",
                     "number" : "0x01",
                     "parentHash" : "0x417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953",
                     "receiptTrie" : "0x089f0c9e29a7ce65e0d065a95e6b18f035d5b9060e68f3909bc5270ce221f19b",
-                    "stateRoot" : "0xd748aabb62702c9be173876658e3814298de8ece927fafee870d8f0ff1e42c37",
+                    "stateRoot" : "0x9573f9867c3a667c1e06a39589049cb804141a35d1d43baf3ef0e36058506076",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d748aabb62702c9be173876658e3814298de8ece927fafee870d8f0ff1e42c37a0695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655ba0089f0c9e29a7ce65e0d065a95e6b18f035d5b9060e68f3909bc5270ce221f19bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf28203e880a00c8b5cfb7dbe1ceb7ee235574201bf80b711e250a81327387f13557ef52d5d8888673419ccc3f69a7bf862f860800183030d4094095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca0c65220d22ee9533e69ca0cca4f2d90dbabd0db71e86883dda79a6135a896c6c2a0148c872a3758db30e6cff63d5f8c1155bdf13d9a39bf993b42d3f2cc7a0c568ac0",
+                "rlp" : "0xf9025ff901f7a0417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09573f9867c3a667c1e06a39589049cb804141a35d1d43baf3ef0e36058506076a0695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655ba0089f0c9e29a7ce65e0d065a95e6b18f035d5b9060e68f3909bc5270ce221f19bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf28203e880a092f67e51f1e1fde3135e2585d9dbfa5858cad2c07ab92675dbabbbdec93bf41888f4e67e6ac72959b2f862f860800183030d4094095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca0c65220d22ee9533e69ca0cca4f2d90dbabd0db71e86883dda79a6135a896c6c2a0148c872a3758db30e6cff63d5f8c1155bdf13d9a39bf993b42d3f2cc7a0c568ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -192,7 +185,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa068ac7c65a3a31b7d8be621d99d2f227701585de873dbdaa2b5f8d74be15af1b2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd53b2788cd645fa2bea2441e94946e5c8e1af8ce50522722a0f55590242c6611",
+        "lastblockhash" : "0x713d72ba2fde4089a113dd3ceabf32fe4e2514bc4901e8fa12313cba6c55470d",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -212,7 +205,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f47bf2",
+                "balance" : "0x29a2241af62c7bf2",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -262,7 +255,7 @@
     "refund_CallA_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -274,9 +267,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x7bf2",
-                    "hash" : "0xdfaff700e5082ed3e9fa886de72337ad961969f6863299e218ed54b2b8b88863",
-                    "mixHash" : "0x6e8aa07fb452fe48fb812cfc8cefefd4966705593b796a04b551527e64fafbbf",
-                    "nonce" : "0xb5ea4fcef0b1074e",
+                    "hash" : "0xe4ff542fc9aaf491af349ee0df33b6505d010f89a0ef1569288e1543d4400bac",
+                    "mixHash" : "0xf2deab1bc5c5346eedcd471d96d80a6fde60003dad86be436d325bb6b6482dd3",
+                    "nonce" : "0x6e4400acc11cfc00",
                     "number" : "0x01",
                     "parentHash" : "0x417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953",
                     "receiptTrie" : "0x1ccce45ab6a9d6e666b9f00a67822b65e8d30243af4733d1db59eb3c66655c37",
@@ -285,7 +278,7 @@
                     "transactionsTrie" : "0x695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03dd549638735fb2160ccf195863120a4ac67c43a8e2595bde237736b2a354781a0695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655ba01ccce45ab6a9d6e666b9f00a67822b65e8d30243af4733d1db59eb3c66655c37b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf28203e880a06e8aa07fb452fe48fb812cfc8cefefd4966705593b796a04b551527e64fafbbf88b5ea4fcef0b1074ef862f860800183030d4094095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca0c65220d22ee9533e69ca0cca4f2d90dbabd0db71e86883dda79a6135a896c6c2a0148c872a3758db30e6cff63d5f8c1155bdf13d9a39bf993b42d3f2cc7a0c568ac0",
+                "rlp" : "0xf9025ff901f7a0417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03dd549638735fb2160ccf195863120a4ac67c43a8e2595bde237736b2a354781a0695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655ba01ccce45ab6a9d6e666b9f00a67822b65e8d30243af4733d1db59eb3c66655c37b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf28203e880a0f2deab1bc5c5346eedcd471d96d80a6fde60003dad86be436d325bb6b6482dd3886e4400acc11cfc00f862f860800183030d4094095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca0c65220d22ee9533e69ca0cca4f2d90dbabd0db71e86883dda79a6135a896c6c2a0148c872a3758db30e6cff63d5f8c1155bdf13d9a39bf993b42d3f2cc7a0c568ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -322,7 +315,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa068ac7c65a3a31b7d8be621d99d2f227701585de873dbdaa2b5f8d74be15af1b2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdfaff700e5082ed3e9fa886de72337ad961969f6863299e218ed54b2b8b88863",
+        "lastblockhash" : "0xe4ff542fc9aaf491af349ee0df33b6505d010f89a0ef1569288e1543d4400bac",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -385,7 +378,7 @@
     "refund_CallA_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -397,9 +390,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x7bf2",
-                    "hash" : "0xf2482b580bf9ae74245427ee78c7c4dfdf39442984faec1961d40b5d9ec02df7",
-                    "mixHash" : "0x75a495a63f89077b703a1165b460f8999ecb08ab4af8769977e783255da19361",
-                    "nonce" : "0xff879e6c0d4b476b",
+                    "hash" : "0x355ba117d1efc13f754be6c97d3ad332f84efcc9a5408d4cb527328508a69f44",
+                    "mixHash" : "0x2b090fc136570c5c78944b78e4cbf74c9cccad366c09a5a35c76599852b1cf80",
+                    "nonce" : "0x4f6363547c523be6",
                     "number" : "0x01",
                     "parentHash" : "0x417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953",
                     "receiptTrie" : "0x1ccce45ab6a9d6e666b9f00a67822b65e8d30243af4733d1db59eb3c66655c37",
@@ -408,7 +401,7 @@
                     "transactionsTrie" : "0x695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03dd549638735fb2160ccf195863120a4ac67c43a8e2595bde237736b2a354781a0695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655ba01ccce45ab6a9d6e666b9f00a67822b65e8d30243af4733d1db59eb3c66655c37b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf28203e880a075a495a63f89077b703a1165b460f8999ecb08ab4af8769977e783255da1936188ff879e6c0d4b476bf862f860800183030d4094095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca0c65220d22ee9533e69ca0cca4f2d90dbabd0db71e86883dda79a6135a896c6c2a0148c872a3758db30e6cff63d5f8c1155bdf13d9a39bf993b42d3f2cc7a0c568ac0",
+                "rlp" : "0xf9025ff901f7a0417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03dd549638735fb2160ccf195863120a4ac67c43a8e2595bde237736b2a354781a0695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655ba01ccce45ab6a9d6e666b9f00a67822b65e8d30243af4733d1db59eb3c66655c37b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf28203e880a02b090fc136570c5c78944b78e4cbf74c9cccad366c09a5a35c76599852b1cf80884f6363547c523be6f862f860800183030d4094095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca0c65220d22ee9533e69ca0cca4f2d90dbabd0db71e86883dda79a6135a896c6c2a0148c872a3758db30e6cff63d5f8c1155bdf13d9a39bf993b42d3f2cc7a0c568ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -445,7 +438,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa068ac7c65a3a31b7d8be621d99d2f227701585de873dbdaa2b5f8d74be15af1b2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf2482b580bf9ae74245427ee78c7c4dfdf39442984faec1961d40b5d9ec02df7",
+        "lastblockhash" : "0x355ba117d1efc13f754be6c97d3ad332f84efcc9a5408d4cb527328508a69f44",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -508,7 +501,7 @@
     "refund_CallA_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -520,9 +513,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x795e",
-                    "hash" : "0x972bff7339ad944efb33925f68588c2f8df429b2c58be3c11f377cab31977acb",
-                    "mixHash" : "0xcf893c1f60509d4ac13e668d3e66aa76d8ad8bb6e790d54e1321a733cc1288b6",
-                    "nonce" : "0x5478129f288abd8e",
+                    "hash" : "0xff238c9ec7347bde5b0a47cbb247a2982f2c38d58ce15ef2b72de7007db731b3",
+                    "mixHash" : "0x88bb519db5b9acd5795da1b425ee05d8e67250e0b023dc043ba492b77aacb4f6",
+                    "nonce" : "0xdb9df1c89892881e",
                     "number" : "0x01",
                     "parentHash" : "0x417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953",
                     "receiptTrie" : "0xe76b86ccbec5399176a16dc8e3cbc3a936db1b328e7a55a09c4328c54b7d2f18",
@@ -531,7 +524,7 @@
                     "transactionsTrie" : "0x695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08f513fa246e67ac0c2884bbdac76260a16224e0dc4fff830bb1def9e261c9181a0695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655ba0e76b86ccbec5399176a16dc8e3cbc3a936db1b328e7a55a09c4328c54b7d2f18b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795e8203e880a0cf893c1f60509d4ac13e668d3e66aa76d8ad8bb6e790d54e1321a733cc1288b6885478129f288abd8ef862f860800183030d4094095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca0c65220d22ee9533e69ca0cca4f2d90dbabd0db71e86883dda79a6135a896c6c2a0148c872a3758db30e6cff63d5f8c1155bdf13d9a39bf993b42d3f2cc7a0c568ac0",
+                "rlp" : "0xf9025ff901f7a0417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08f513fa246e67ac0c2884bbdac76260a16224e0dc4fff830bb1def9e261c9181a0695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655ba0e76b86ccbec5399176a16dc8e3cbc3a936db1b328e7a55a09c4328c54b7d2f18b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795e8203e880a088bb519db5b9acd5795da1b425ee05d8e67250e0b023dc043ba492b77aacb4f688db9df1c89892881ef862f860800183030d4094095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca0c65220d22ee9533e69ca0cca4f2d90dbabd0db71e86883dda79a6135a896c6c2a0148c872a3758db30e6cff63d5f8c1155bdf13d9a39bf993b42d3f2cc7a0c568ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -568,7 +561,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa068ac7c65a3a31b7d8be621d99d2f227701585de873dbdaa2b5f8d74be15af1b2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x972bff7339ad944efb33925f68588c2f8df429b2c58be3c11f377cab31977acb",
+        "lastblockhash" : "0xff238c9ec7347bde5b0a47cbb247a2982f2c38d58ce15ef2b72de7007db731b3",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -631,7 +624,7 @@
     "refund_CallA_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -643,9 +636,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x795e",
-                    "hash" : "0x35c98cf5cd9c389c6f8b431a7c51baf7499b981031f1eccac9d6400aee50ce4f",
-                    "mixHash" : "0xfc1952b55031f7b176f9c2d6b943cc7e70704afa6984f208264b26db7fe633c6",
-                    "nonce" : "0xdfb777290f3c9bc8",
+                    "hash" : "0xfc465dc39a3df7ceeebb4a6c59ff9d785e57d596432f546944961666063b57e5",
+                    "mixHash" : "0x99a0d25feea3ba4159970d15e652d245119a56000ba29b1219c1fc77585cb967",
+                    "nonce" : "0xc0687608793c49ec",
                     "number" : "0x01",
                     "parentHash" : "0x417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953",
                     "receiptTrie" : "0xe76b86ccbec5399176a16dc8e3cbc3a936db1b328e7a55a09c4328c54b7d2f18",
@@ -654,7 +647,7 @@
                     "transactionsTrie" : "0x695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08f513fa246e67ac0c2884bbdac76260a16224e0dc4fff830bb1def9e261c9181a0695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655ba0e76b86ccbec5399176a16dc8e3cbc3a936db1b328e7a55a09c4328c54b7d2f18b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795e8203e880a0fc1952b55031f7b176f9c2d6b943cc7e70704afa6984f208264b26db7fe633c688dfb777290f3c9bc8f862f860800183030d4094095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca0c65220d22ee9533e69ca0cca4f2d90dbabd0db71e86883dda79a6135a896c6c2a0148c872a3758db30e6cff63d5f8c1155bdf13d9a39bf993b42d3f2cc7a0c568ac0",
+                "rlp" : "0xf9025ff901f7a0417ece6e4175ae7f1bf6b8ed90b4ea22206353a7450aa10bdd5e2ba3cb2bd953a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08f513fa246e67ac0c2884bbdac76260a16224e0dc4fff830bb1def9e261c9181a0695e9f711e29c5a4a8507d7b653d66ca7d414ad89b14aa6b65be7c28d53d655ba0e76b86ccbec5399176a16dc8e3cbc3a936db1b328e7a55a09c4328c54b7d2f18b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795e8203e880a099a0d25feea3ba4159970d15e652d245119a56000ba29b1219c1fc77585cb96788c0687608793c49ecf862f860800183030d4094095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca0c65220d22ee9533e69ca0cca4f2d90dbabd0db71e86883dda79a6135a896c6c2a0148c872a3758db30e6cff63d5f8c1155bdf13d9a39bf993b42d3f2cc7a0c568ac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -691,7 +684,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa068ac7c65a3a31b7d8be621d99d2f227701585de873dbdaa2b5f8d74be15af1b2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x35c98cf5cd9c389c6f8b431a7c51baf7499b981031f1eccac9d6400aee50ce4f",
+        "lastblockhash" : "0xfc465dc39a3df7ceeebb4a6c59ff9d785e57d596432f546944961666063b57e5",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallA_notEnoughGasInCall_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallA_notEnoughGasInCall_d0g0v0.json
index 91c49bed2..2cbbd14a2 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallA_notEnoughGasInCall_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallA_notEnoughGasInCall_d0g0v0.json
@@ -2,7 +2,7 @@
     "refund_CallA_notEnoughGasInCall_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_notEnoughGasInCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x7bf1",
-                    "hash" : "0x027c79c9be4e27ff3b55949518b235de64a48d95db5f1c970383172336da12e5",
-                    "mixHash" : "0x37feac9cce9141a9fc3aa56c279db248d1be5a4143f24db02e9288126f514ee1",
-                    "nonce" : "0x227f6d6fd1f3e80c",
+                    "hash" : "0x15c82b49aed8ca5c2d7d392b4ef5db42542922f6271da1f345a17747e26716ac",
+                    "mixHash" : "0x0d09b1cc78ff4b972f4484f2d34988e5fb5e73a432a7fc16c40e06c7782ee534",
+                    "nonce" : "0x0375d789385aa414",
                     "number" : "0x01",
                     "parentHash" : "0x97db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9",
                     "receiptTrie" : "0x0c63b21a9354c48ef9a6a9ca36b7d55048e1b26096f140ed8431b5e79cbce81c",
-                    "stateRoot" : "0x82389d6f2ac514b88233a5a4509b1cd6333845781dcd413536d37870170f8851",
+                    "stateRoot" : "0x12307e389f611f4f5a9a7fd9552d69d35c74f3db3a9b04259b6392a7799657bb",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a097db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082389d6f2ac514b88233a5a4509b1cd6333845781dcd413536d37870170f8851a0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a00c63b21a9354c48ef9a6a9ca36b7d55048e1b26096f140ed8431b5e79cbce81cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf18203e880a037feac9cce9141a9fc3aa56c279db248d1be5a4143f24db02e9288126f514ee188227f6d6fd1f3e80cf862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
+                "rlp" : "0xf9025ff901f7a097db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012307e389f611f4f5a9a7fd9552d69d35c74f3db3a9b04259b6392a7799657bba0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a00c63b21a9354c48ef9a6a9ca36b7d55048e1b26096f140ed8431b5e79cbce81cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf18203e880a00d09b1cc78ff4b972f4484f2d34988e5fb5e73a432a7fc16c40e06c7782ee534880375d789385aa414f862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c91324185999270a5e384418116d61a2addcd1dfb2d0ed87e9fa6c4ec565c421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x027c79c9be4e27ff3b55949518b235de64a48d95db5f1c970383172336da12e5",
+        "lastblockhash" : "0x15c82b49aed8ca5c2d7d392b4ef5db42542922f6271da1f345a17747e26716ac",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa61138df1600055",
@@ -81,7 +74,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f47bf1",
+                "balance" : "0x29a2241af62c7bf1",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -132,7 +125,7 @@
     "refund_CallA_notEnoughGasInCall_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_notEnoughGasInCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -144,18 +137,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x7bf1",
-                    "hash" : "0xb4633af731f8d33c08745e922db27e9640e4f61d4ed3218649f7af155e886194",
-                    "mixHash" : "0x476c1dceeb5ff76b2fba9119fcca469700807bc781fc23463409199ba9bb9586",
-                    "nonce" : "0xe3f07a7de8829846",
+                    "hash" : "0x856841dacb6435b3ac2ebdc541706847ca2f3c7449e5e2e80730de9b38ae8dea",
+                    "mixHash" : "0x3de12ba709889ade5a5b5e8e20135f63bb076071a69b5c076c221679506c039a",
+                    "nonce" : "0x3f846e5eef92a2ea",
                     "number" : "0x01",
                     "parentHash" : "0x97db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9",
                     "receiptTrie" : "0x0c63b21a9354c48ef9a6a9ca36b7d55048e1b26096f140ed8431b5e79cbce81c",
-                    "stateRoot" : "0x82389d6f2ac514b88233a5a4509b1cd6333845781dcd413536d37870170f8851",
+                    "stateRoot" : "0x6ac7b8f450d7d778936178a206badc2e580c37bb31ffc1d82c25d799c6e9896c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a097db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082389d6f2ac514b88233a5a4509b1cd6333845781dcd413536d37870170f8851a0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a00c63b21a9354c48ef9a6a9ca36b7d55048e1b26096f140ed8431b5e79cbce81cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf18203e880a0476c1dceeb5ff76b2fba9119fcca469700807bc781fc23463409199ba9bb958688e3f07a7de8829846f862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
+                "rlp" : "0xf9025ff901f7a097db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ac7b8f450d7d778936178a206badc2e580c37bb31ffc1d82c25d799c6e9896ca0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a00c63b21a9354c48ef9a6a9ca36b7d55048e1b26096f140ed8431b5e79cbce81cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf18203e880a03de12ba709889ade5a5b5e8e20135f63bb076071a69b5c076c221679506c039a883f846e5eef92a2eaf862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -192,7 +185,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c91324185999270a5e384418116d61a2addcd1dfb2d0ed87e9fa6c4ec565c421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb4633af731f8d33c08745e922db27e9640e4f61d4ed3218649f7af155e886194",
+        "lastblockhash" : "0x856841dacb6435b3ac2ebdc541706847ca2f3c7449e5e2e80730de9b38ae8dea",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -211,7 +204,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f47bf1",
+                "balance" : "0x29a2241af62c7bf1",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -262,7 +255,7 @@
     "refund_CallA_notEnoughGasInCall_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_notEnoughGasInCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -274,9 +267,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x7bf1",
-                    "hash" : "0xbf8b5a4e8dd3e20fa2faf40d26af9eea22d47943cdab330eaaf37e9c6c18fc1e",
-                    "mixHash" : "0xc269ebd2e2eb6092cb21ac0971aae9269d3ba9a60ed26a17374d266ac5ec1111",
-                    "nonce" : "0xcb23cefd54689b91",
+                    "hash" : "0x7e1080fdfb0bd1ae89115fc98efc23cc4de34dc68c9dfe774a490ee5a5635020",
+                    "mixHash" : "0x2196c7e6c38f3eb7dc6d496cf39cb316eae093d2d119f49e4ffd96ae2fb938b1",
+                    "nonce" : "0x67e748efe0887db5",
                     "number" : "0x01",
                     "parentHash" : "0x97db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9",
                     "receiptTrie" : "0x1294c1bc15d6a73500ad9133312e2e4aa3162e12e556aa1bcf34254ef1f4ecff",
@@ -285,7 +278,7 @@
                     "transactionsTrie" : "0xac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a097db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d9f69e59d6fc5fa9c828c4152eb9bd3a6039fc59e5d685c36b804bff87afc70a0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a01294c1bc15d6a73500ad9133312e2e4aa3162e12e556aa1bcf34254ef1f4ecffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf18203e880a0c269ebd2e2eb6092cb21ac0971aae9269d3ba9a60ed26a17374d266ac5ec111188cb23cefd54689b91f862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
+                "rlp" : "0xf9025ff901f7a097db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d9f69e59d6fc5fa9c828c4152eb9bd3a6039fc59e5d685c36b804bff87afc70a0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a01294c1bc15d6a73500ad9133312e2e4aa3162e12e556aa1bcf34254ef1f4ecffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf18203e880a02196c7e6c38f3eb7dc6d496cf39cb316eae093d2d119f49e4ffd96ae2fb938b18867e748efe0887db5f862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -322,7 +315,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c91324185999270a5e384418116d61a2addcd1dfb2d0ed87e9fa6c4ec565c421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbf8b5a4e8dd3e20fa2faf40d26af9eea22d47943cdab330eaaf37e9c6c18fc1e",
+        "lastblockhash" : "0x7e1080fdfb0bd1ae89115fc98efc23cc4de34dc68c9dfe774a490ee5a5635020",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -385,7 +378,7 @@
     "refund_CallA_notEnoughGasInCall_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_notEnoughGasInCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -397,9 +390,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x7bf1",
-                    "hash" : "0x7456a0935976d5b550dd40dcac0094596054a762600d6350ec15a5ccb23376e7",
-                    "mixHash" : "0xb0bbafdf02de0d658a3cad6013a2b5723b3f8929f58b9becc0a5b2afce901325",
-                    "nonce" : "0x41b37f0efce64dca",
+                    "hash" : "0xddc142d5a76a503cebd8004a0d05781c7fd495ee7ca39aba4299b4de730a35ac",
+                    "mixHash" : "0x84fa105a9d0887c42e94735559a0015aecb2b608c1aa2860baf2a60af72ef10f",
+                    "nonce" : "0xba067ed5df6c8477",
                     "number" : "0x01",
                     "parentHash" : "0x97db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9",
                     "receiptTrie" : "0x1294c1bc15d6a73500ad9133312e2e4aa3162e12e556aa1bcf34254ef1f4ecff",
@@ -408,7 +401,7 @@
                     "transactionsTrie" : "0xac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a097db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d9f69e59d6fc5fa9c828c4152eb9bd3a6039fc59e5d685c36b804bff87afc70a0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a01294c1bc15d6a73500ad9133312e2e4aa3162e12e556aa1bcf34254ef1f4ecffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf18203e880a0b0bbafdf02de0d658a3cad6013a2b5723b3f8929f58b9becc0a5b2afce9013258841b37f0efce64dcaf862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
+                "rlp" : "0xf9025ff901f7a097db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d9f69e59d6fc5fa9c828c4152eb9bd3a6039fc59e5d685c36b804bff87afc70a0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a01294c1bc15d6a73500ad9133312e2e4aa3162e12e556aa1bcf34254ef1f4ecffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240827bf18203e880a084fa105a9d0887c42e94735559a0015aecb2b608c1aa2860baf2a60af72ef10f88ba067ed5df6c8477f862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -445,7 +438,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c91324185999270a5e384418116d61a2addcd1dfb2d0ed87e9fa6c4ec565c421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7456a0935976d5b550dd40dcac0094596054a762600d6350ec15a5ccb23376e7",
+        "lastblockhash" : "0xddc142d5a76a503cebd8004a0d05781c7fd495ee7ca39aba4299b4de730a35ac",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -508,7 +501,7 @@
     "refund_CallA_notEnoughGasInCall_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_notEnoughGasInCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -520,9 +513,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x795d",
-                    "hash" : "0x09f313dcb391976282c7e9f28ccae27551940c011d08a2a1186de8e76aac61cd",
-                    "mixHash" : "0xcc3c1e0729ef12027bdd09d30f54d8e4579dee0fccbb14cd9857ff70a8159583",
-                    "nonce" : "0x9f507f6890c5cbae",
+                    "hash" : "0xb683f1b43b399d46bf0f2d0871ab29056ca5e19c174bd82171b0df6cccf377e6",
+                    "mixHash" : "0xd543bd5b87c9abe87fc897c800bec30e10d18132b62c1c7d48bebe135160f5f4",
+                    "nonce" : "0xd521b80b040b7d10",
                     "number" : "0x01",
                     "parentHash" : "0x97db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9",
                     "receiptTrie" : "0xc3520a889b7b850f83ae84518e2f774054e53647356ea0b1756dc13b0ffb4241",
@@ -531,7 +524,7 @@
                     "transactionsTrie" : "0xac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a097db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0956c6deeb2ec461f3d1dd7e009089b8ee0c4b11c4e864d5b2fe55433a9b73f9ea0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a0c3520a889b7b850f83ae84518e2f774054e53647356ea0b1756dc13b0ffb4241b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a0cc3c1e0729ef12027bdd09d30f54d8e4579dee0fccbb14cd9857ff70a8159583889f507f6890c5cbaef862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
+                "rlp" : "0xf9025ff901f7a097db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0956c6deeb2ec461f3d1dd7e009089b8ee0c4b11c4e864d5b2fe55433a9b73f9ea0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a0c3520a889b7b850f83ae84518e2f774054e53647356ea0b1756dc13b0ffb4241b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a0d543bd5b87c9abe87fc897c800bec30e10d18132b62c1c7d48bebe135160f5f488d521b80b040b7d10f862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -568,7 +561,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c91324185999270a5e384418116d61a2addcd1dfb2d0ed87e9fa6c4ec565c421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x09f313dcb391976282c7e9f28ccae27551940c011d08a2a1186de8e76aac61cd",
+        "lastblockhash" : "0xb683f1b43b399d46bf0f2d0871ab29056ca5e19c174bd82171b0df6cccf377e6",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -631,7 +624,7 @@
     "refund_CallA_notEnoughGasInCall_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallA_notEnoughGasInCall_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -643,9 +636,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x795d",
-                    "hash" : "0xc6981389cb9436a49958a105a4aa38fe311e4aee99a4ec769289916846be18ad",
-                    "mixHash" : "0x233ce97750e799f0505b0f3a97c3350aaa766006558e6ca485303653d6ca2764",
-                    "nonce" : "0x9df864e963e5f138",
+                    "hash" : "0x487152743f72203762105722f8f0a2f90f1cde29f135def36f6aba98ca25e381",
+                    "mixHash" : "0x82825da31fd367d50724fb828eca52319f75aa2c734e28821bc167c915583f05",
+                    "nonce" : "0x840389a02db22577",
                     "number" : "0x01",
                     "parentHash" : "0x97db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9",
                     "receiptTrie" : "0xc3520a889b7b850f83ae84518e2f774054e53647356ea0b1756dc13b0ffb4241",
@@ -654,7 +647,7 @@
                     "transactionsTrie" : "0xac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a097db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0956c6deeb2ec461f3d1dd7e009089b8ee0c4b11c4e864d5b2fe55433a9b73f9ea0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a0c3520a889b7b850f83ae84518e2f774054e53647356ea0b1756dc13b0ffb4241b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a0233ce97750e799f0505b0f3a97c3350aaa766006558e6ca485303653d6ca2764889df864e963e5f138f862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
+                "rlp" : "0xf9025ff901f7a097db4abd9e0d681758bc39e683add6bfb28fd95562512ba60b76a29be7f90ab9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0956c6deeb2ec461f3d1dd7e009089b8ee0c4b11c4e864d5b2fe55433a9b73f9ea0ac17c4b8de7653cfabc0272d6e1803064949cdd66fd57a713ae1ffe24bfb5293a0c3520a889b7b850f83ae84518e2f774054e53647356ea0b1756dc13b0ffb4241b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082795d8203e880a082825da31fd367d50724fb828eca52319f75aa2c734e28821bc167c915583f0588840389a02db22577f862f860800183014c0894095e7baea6a6c7c4c2dfeb977efac326af552d870a801ca04d52b16e9e2813953622dc36e9fc90c1d12fa114a0f7eec136f8129eef11be4ca039aa3ab1e3a55f591c272f7e48f82d1570d27f64cfcd4abd581c05be11d646c0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -691,7 +684,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c91324185999270a5e384418116d61a2addcd1dfb2d0ed87e9fa6c4ec565c421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc6981389cb9436a49958a105a4aa38fe311e4aee99a4ec769289916846be18ad",
+        "lastblockhash" : "0x487152743f72203762105722f8f0a2f90f1cde29f135def36f6aba98ca25e381",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage_d0g0v0.json
index a34501a63..fa1ef96d1 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage_d0g0v0.json
@@ -2,7 +2,7 @@
     "refund_CallToSuicideNoStorage_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideNoStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x6b5b",
-                    "hash" : "0xaf69574237ead3d0939ef7d40862b5b350a7d9e189b79c7951dff056a906faf1",
-                    "mixHash" : "0x7eb8c6b0d8d1fb7c2c5348b151d7d0f1c6000c82f48122a48bdb62cc5a8c72aa",
-                    "nonce" : "0xc18b762969bd40f9",
+                    "hash" : "0x369e03b3b508dea0b991796939685d604a4386666c9e2f0f5526fb981815c7eb",
+                    "mixHash" : "0xf58adcc9f6c260ac4340100d76503c24505a684b3e2221a51bdff807f232cd1e",
+                    "nonce" : "0x124d4a8940cacc79",
                     "number" : "0x01",
                     "parentHash" : "0xa26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6",
                     "receiptTrie" : "0x0c896fedc3d6ff2d36ec21231da77c2591a3a7def71219eed8af4d55e8d51eed",
-                    "stateRoot" : "0xf5b84843abfc27eaa9ba7fb1dbc793d14b7090d8fe48650ec279c1dd84abf81f",
+                    "stateRoot" : "0x95a7d35d0d8644fe0b613f4c32ec5277704bcf11338e370f5b6c3affdd8f73ea",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5b84843abfc27eaa9ba7fb1dbc793d14b7090d8fe48650ec279c1dd84abf81fa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba00c896fedc3d6ff2d36ec21231da77c2591a3a7def71219eed8af4d55e8d51eedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a07eb8c6b0d8d1fb7c2c5348b151d7d0f1c6000c82f48122a48bdb62cc5a8c72aa88c18b762969bd40f9f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa095a7d35d0d8644fe0b613f4c32ec5277704bcf11338e370f5b6c3affdd8f73eaa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba00c896fedc3d6ff2d36ec21231da77c2591a3a7def71219eed8af4d55e8d51eedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a0f58adcc9f6c260ac4340100d76503c24505a684b3e2221a51bdff807f232cd1e88124d4a8940cacc79f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097f06e9b6eb04ffc2197b9e2f902aea3accd588b825d7f1a9a305af440bf0beaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaf69574237ead3d0939ef7d40862b5b350a7d9e189b79c7951dff056a906faf1",
+        "lastblockhash" : "0x369e03b3b508dea0b991796939685d604a4386666c9e2f0f5526fb981815c7eb",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600055",
@@ -81,7 +74,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f46b5b",
+                "balance" : "0x29a2241af62c6b5b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -130,7 +123,7 @@
     "refund_CallToSuicideNoStorage_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideNoStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -142,18 +135,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x6b5b",
-                    "hash" : "0x8375e9e442f8ae37639933ec7fd0f413faa2b4f6e02bfb178b4e28140067c0cd",
-                    "mixHash" : "0x82ec43466b5c2728c9e36b73848a754f8258b0baa9accc48a433fc8713cd3feb",
-                    "nonce" : "0xbb7276ba1e5b7c2d",
+                    "hash" : "0x4c55c07100bc9d3fd33d7aeadc90ea2fdba2dc41b6fd1e346b4cb29bd81d2063",
+                    "mixHash" : "0xa440b0bd8883e12124ef033ed995b647050443fe96b76b6a112774318bd68c4b",
+                    "nonce" : "0xdb5eaf4c97bd2b02",
                     "number" : "0x01",
                     "parentHash" : "0xa26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6",
                     "receiptTrie" : "0x0c896fedc3d6ff2d36ec21231da77c2591a3a7def71219eed8af4d55e8d51eed",
-                    "stateRoot" : "0xf5b84843abfc27eaa9ba7fb1dbc793d14b7090d8fe48650ec279c1dd84abf81f",
+                    "stateRoot" : "0xf139e4c5f0c9c8bb2445dc54ef04897a35565a19f575ade4f7244138da512849",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f5b84843abfc27eaa9ba7fb1dbc793d14b7090d8fe48650ec279c1dd84abf81fa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba00c896fedc3d6ff2d36ec21231da77c2591a3a7def71219eed8af4d55e8d51eedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a082ec43466b5c2728c9e36b73848a754f8258b0baa9accc48a433fc8713cd3feb88bb7276ba1e5b7c2df882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f139e4c5f0c9c8bb2445dc54ef04897a35565a19f575ade4f7244138da512849a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba00c896fedc3d6ff2d36ec21231da77c2591a3a7def71219eed8af4d55e8d51eedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a0a440b0bd8883e12124ef033ed995b647050443fe96b76b6a112774318bd68c4b88db5eaf4c97bd2b02f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -190,7 +183,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097f06e9b6eb04ffc2197b9e2f902aea3accd588b825d7f1a9a305af440bf0beaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8375e9e442f8ae37639933ec7fd0f413faa2b4f6e02bfb178b4e28140067c0cd",
+        "lastblockhash" : "0x4c55c07100bc9d3fd33d7aeadc90ea2fdba2dc41b6fd1e346b4cb29bd81d2063",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -209,7 +202,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f46b5b",
+                "balance" : "0x29a2241af62c6b5b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -258,7 +251,7 @@
     "refund_CallToSuicideNoStorage_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideNoStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -270,9 +263,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x6b5b",
-                    "hash" : "0xe5e498131a470bcfccd8a33aaee62d8ddadecf91d76514ef1cfc1f53089c3c07",
-                    "mixHash" : "0x1ceb3b3b0a0e975c8ca056601a8d80a4391a5b214524b75137545e26d15441ec",
-                    "nonce" : "0x5e9e8a620caeda61",
+                    "hash" : "0x76a691fc2e10542a0b2f5be37127131bb1ea7363036ade06fd7b25dd332c70d5",
+                    "mixHash" : "0xd627ac7af8c9d4f322f5d8eb1ac498de35bbbc37128ad8819986d9dfffebc755",
+                    "nonce" : "0x7ed304b25d53df84",
                     "number" : "0x01",
                     "parentHash" : "0xa26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6",
                     "receiptTrie" : "0x7bc5b8b776d3e52217a40c51661f05054de6b86a5293bd7154cfabf695f49edb",
@@ -281,7 +274,7 @@
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa067413ad4a30c5d6752f1c4b97781cc43dc7abc4cbb5268feb1d0b9a9cfcdcf03a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba07bc5b8b776d3e52217a40c51661f05054de6b86a5293bd7154cfabf695f49edbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a01ceb3b3b0a0e975c8ca056601a8d80a4391a5b214524b75137545e26d15441ec885e9e8a620caeda61f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa067413ad4a30c5d6752f1c4b97781cc43dc7abc4cbb5268feb1d0b9a9cfcdcf03a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba07bc5b8b776d3e52217a40c51661f05054de6b86a5293bd7154cfabf695f49edbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a0d627ac7af8c9d4f322f5d8eb1ac498de35bbbc37128ad8819986d9dfffebc755887ed304b25d53df84f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -318,7 +311,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097f06e9b6eb04ffc2197b9e2f902aea3accd588b825d7f1a9a305af440bf0beaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe5e498131a470bcfccd8a33aaee62d8ddadecf91d76514ef1cfc1f53089c3c07",
+        "lastblockhash" : "0x76a691fc2e10542a0b2f5be37127131bb1ea7363036ade06fd7b25dd332c70d5",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -379,7 +372,7 @@
     "refund_CallToSuicideNoStorage_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideNoStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -391,9 +384,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x6b5b",
-                    "hash" : "0xa50715c3f515e7fbbfb89792f5da8a39c7729c023fe664b7ce31f076af54583a",
-                    "mixHash" : "0x6c40e532827b79e658f43f1cdb04f56d74419832d7710b0e283015934d33d096",
-                    "nonce" : "0xcfd0efb39a4eb801",
+                    "hash" : "0x3239ec5b8a861d72abfa6d793a8444a01b28c2e2fdaeda86b640b27ed4bf29f7",
+                    "mixHash" : "0x29ea1fcd67506da3ccb1cfe777810d5d3e0e1ea88157e659d4dab3b19b4b9edb",
+                    "nonce" : "0x106f0e53e7ad269c",
                     "number" : "0x01",
                     "parentHash" : "0xa26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6",
                     "receiptTrie" : "0x7bc5b8b776d3e52217a40c51661f05054de6b86a5293bd7154cfabf695f49edb",
@@ -402,7 +395,7 @@
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa067413ad4a30c5d6752f1c4b97781cc43dc7abc4cbb5268feb1d0b9a9cfcdcf03a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba07bc5b8b776d3e52217a40c51661f05054de6b86a5293bd7154cfabf695f49edbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a06c40e532827b79e658f43f1cdb04f56d74419832d7710b0e283015934d33d09688cfd0efb39a4eb801f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa067413ad4a30c5d6752f1c4b97781cc43dc7abc4cbb5268feb1d0b9a9cfcdcf03a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba07bc5b8b776d3e52217a40c51661f05054de6b86a5293bd7154cfabf695f49edbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a029ea1fcd67506da3ccb1cfe777810d5d3e0e1ea88157e659d4dab3b19b4b9edb88106f0e53e7ad269cf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -439,7 +432,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097f06e9b6eb04ffc2197b9e2f902aea3accd588b825d7f1a9a305af440bf0beaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa50715c3f515e7fbbfb89792f5da8a39c7729c023fe664b7ce31f076af54583a",
+        "lastblockhash" : "0x3239ec5b8a861d72abfa6d793a8444a01b28c2e2fdaeda86b640b27ed4bf29f7",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -500,7 +493,7 @@
     "refund_CallToSuicideNoStorage_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideNoStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -512,9 +505,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x50b7",
-                    "hash" : "0xb9f837522c126256c5f7b98c003037a7b4b2ca974c172983a4145606e5c0f2d3",
-                    "mixHash" : "0xeee00565a33902fb9717c10ef128051a0917e178e3ae0b1dd771c75165f00686",
-                    "nonce" : "0x9981ce44fc80f82b",
+                    "hash" : "0x22575916cd2f86a24c7846452e5b735d43c4511197061a2a5e042c7b2f98f923",
+                    "mixHash" : "0x7c9ad159b27eb1c236a257bf73e8487a7c7e320ef2d20d1cbf3d16159086b4db",
+                    "nonce" : "0xa4ddeef571260833",
                     "number" : "0x01",
                     "parentHash" : "0xa26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6",
                     "receiptTrie" : "0xd74cbd00f66c19de7f9cc6f6529dc48c31c9a4dc1f25c7c780e888218db1145e",
@@ -523,7 +516,7 @@
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e1b2251f193b62f4a4857ff37d38855897c7af48a88e037ae6b522049bc2a6aa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0d74cbd00f66c19de7f9cc6f6529dc48c31c9a4dc1f25c7c780e888218db1145eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250b78203e880a0eee00565a33902fb9717c10ef128051a0917e178e3ae0b1dd771c75165f00686889981ce44fc80f82bf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e1b2251f193b62f4a4857ff37d38855897c7af48a88e037ae6b522049bc2a6aa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0d74cbd00f66c19de7f9cc6f6529dc48c31c9a4dc1f25c7c780e888218db1145eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250b78203e880a07c9ad159b27eb1c236a257bf73e8487a7c7e320ef2d20d1cbf3d16159086b4db88a4ddeef571260833f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -560,7 +553,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097f06e9b6eb04ffc2197b9e2f902aea3accd588b825d7f1a9a305af440bf0beaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb9f837522c126256c5f7b98c003037a7b4b2ca974c172983a4145606e5c0f2d3",
+        "lastblockhash" : "0x22575916cd2f86a24c7846452e5b735d43c4511197061a2a5e042c7b2f98f923",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -615,7 +608,7 @@
     "refund_CallToSuicideNoStorage_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideNoStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -627,9 +620,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x50b7",
-                    "hash" : "0x030da33f0e16f74a504fd9e02c8ee71aea1f2e787eb1b6679e69ad7afe042c2e",
-                    "mixHash" : "0x26458aa093f3a9e6e2e08a1aca5ce5cbda125f4ec5fbde2de9029f793f9582cc",
-                    "nonce" : "0x07789d068a02348a",
+                    "hash" : "0xf65f7a6505b32ffe738a704b106b6066be7de5ede7da390f8f8aed42402cf367",
+                    "mixHash" : "0xed32f713cd644d5b8132f3e64733e5b9bf13fad999c8e568e25b2bde249dfe0e",
+                    "nonce" : "0x480d21da55dc7fab",
                     "number" : "0x01",
                     "parentHash" : "0xa26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6",
                     "receiptTrie" : "0xd74cbd00f66c19de7f9cc6f6529dc48c31c9a4dc1f25c7c780e888218db1145e",
@@ -638,7 +631,7 @@
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e1b2251f193b62f4a4857ff37d38855897c7af48a88e037ae6b522049bc2a6aa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0d74cbd00f66c19de7f9cc6f6529dc48c31c9a4dc1f25c7c780e888218db1145eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250b78203e880a026458aa093f3a9e6e2e08a1aca5ce5cbda125f4ec5fbde2de9029f793f9582cc8807789d068a02348af882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e1b2251f193b62f4a4857ff37d38855897c7af48a88e037ae6b522049bc2a6aa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0d74cbd00f66c19de7f9cc6f6529dc48c31c9a4dc1f25c7c780e888218db1145eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250b78203e880a0ed32f713cd644d5b8132f3e64733e5b9bf13fad999c8e568e25b2bde249dfe0e88480d21da55dc7fabf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -675,7 +668,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097f06e9b6eb04ffc2197b9e2f902aea3accd588b825d7f1a9a305af440bf0beaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x030da33f0e16f74a504fd9e02c8ee71aea1f2e787eb1b6679e69ad7afe042c2e",
+        "lastblockhash" : "0xf65f7a6505b32ffe738a704b106b6066be7de5ede7da390f8f8aed42402cf367",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage_d1g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage_d1g0v0.json
index 513ed0868..2d4fc0113 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage_d1g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideNoStorage_d1g0v0.json
@@ -2,7 +2,7 @@
     "refund_CallToSuicideNoStorage_d1g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideNoStorage_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5ba5",
-                    "hash" : "0x0741e4aeba4406457c5434367f0241ce2de2faf2d5ba27a427cbb59c4d760913",
-                    "mixHash" : "0x035be43f9c274af40c0fc223236224e8770ed46abe542ea7ee568cfd1eefc80f",
-                    "nonce" : "0x5baa8addfc304af7",
+                    "hash" : "0x4d557eb2c63d1b0d61b34f1582dae1fee63f36e58e1764611866c29640b843ce",
+                    "mixHash" : "0x6c45ea3cc8fc6b57f663ba4fc35b467a5cc3ed65f1d6c5bcc449b0e43dc6a779",
+                    "nonce" : "0x9fb49e3ec88422b8",
                     "number" : "0x01",
                     "parentHash" : "0xa26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6",
                     "receiptTrie" : "0x72266a13e75386db59178ac5409794ca14df029795264ddc46ffbe93be70ea6f",
-                    "stateRoot" : "0x55751195e47002db8dda08b2db5399c1b0b949b75930a90ac6112785159a0d78",
+                    "stateRoot" : "0x9c23dd1c51e3b3c09c220c1fb86dd6973b482635211dc13f596475ecdd5af2ed",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055751195e47002db8dda08b2db5399c1b0b949b75930a90ac6112785159a0d78a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca072266a13e75386db59178ac5409794ca14df029795264ddc46ffbe93be70ea6fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a0035be43f9c274af40c0fc223236224e8770ed46abe542ea7ee568cfd1eefc80f885baa8addfc304af7f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c23dd1c51e3b3c09c220c1fb86dd6973b482635211dc13f596475ecdd5af2eda06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca072266a13e75386db59178ac5409794ca14df029795264ddc46ffbe93be70ea6fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a06c45ea3cc8fc6b57f663ba4fc35b467a5cc3ed65f1d6c5bcc449b0e43dc6a779889fb49e3ec88422b8f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097f06e9b6eb04ffc2197b9e2f902aea3accd588b825d7f1a9a305af440bf0beaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0741e4aeba4406457c5434367f0241ce2de2faf2d5ba27a427cbb59c4d760913",
+        "lastblockhash" : "0x4d557eb2c63d1b0d61b34f1582dae1fee63f36e58e1764611866c29640b843ce",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec8000a",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600055",
@@ -82,7 +75,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f45ba5",
+                "balance" : "0x29a2241af62c5ba5",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -124,7 +117,7 @@
     "refund_CallToSuicideNoStorage_d1g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideNoStorage_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -136,18 +129,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5ba5",
-                    "hash" : "0xbd2914961667f5ec122ddbce8583b7e43b3b991b07645d242d1ba2ecec68bbff",
-                    "mixHash" : "0xfb3c73219a15b729901579ebab1c49006312f3c0d377c1fd207a5c0c7bf9bd38",
-                    "nonce" : "0xd468b2e0bc7eb4f7",
+                    "hash" : "0x38af43009ff289905dc16e980ea8ecc3a76ed55f73fea6b09ff5101966d1a70f",
+                    "mixHash" : "0x837f6de0e2e3ffbcd73c321457276f3c64af44b703eabf55e80808f05157cf4b",
+                    "nonce" : "0x6cfdb50c17783e89",
                     "number" : "0x01",
                     "parentHash" : "0xa26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6",
                     "receiptTrie" : "0x72266a13e75386db59178ac5409794ca14df029795264ddc46ffbe93be70ea6f",
-                    "stateRoot" : "0x55751195e47002db8dda08b2db5399c1b0b949b75930a90ac6112785159a0d78",
+                    "stateRoot" : "0xaa22bd6475c191e4cd7a75ed3faa44f4bfff9b434d2e3546b0433aaa52bbb141",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055751195e47002db8dda08b2db5399c1b0b949b75930a90ac6112785159a0d78a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca072266a13e75386db59178ac5409794ca14df029795264ddc46ffbe93be70ea6fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a0fb3c73219a15b729901579ebab1c49006312f3c0d377c1fd207a5c0c7bf9bd3888d468b2e0bc7eb4f7f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa22bd6475c191e4cd7a75ed3faa44f4bfff9b434d2e3546b0433aaa52bbb141a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca072266a13e75386db59178ac5409794ca14df029795264ddc46ffbe93be70ea6fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a0837f6de0e2e3ffbcd73c321457276f3c64af44b703eabf55e80808f05157cf4b886cfdb50c17783e89f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -184,7 +177,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097f06e9b6eb04ffc2197b9e2f902aea3accd588b825d7f1a9a305af440bf0beaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbd2914961667f5ec122ddbce8583b7e43b3b991b07645d242d1ba2ecec68bbff",
+        "lastblockhash" : "0x38af43009ff289905dc16e980ea8ecc3a76ed55f73fea6b09ff5101966d1a70f",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -204,7 +197,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f45ba5",
+                "balance" : "0x29a2241af62c5ba5",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -246,7 +239,7 @@
     "refund_CallToSuicideNoStorage_d1g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideNoStorage_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -258,9 +251,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5ba5",
-                    "hash" : "0x5dedb8f1da8809c9cb1d35498abc2002c7c7793e5b983bcf5db7dc0a4588c9ea",
-                    "mixHash" : "0x118d2d66d608352c9c48d44abadf07979b4c317ace88cf34588027cad8d8065e",
-                    "nonce" : "0x1afa8f0f287a7e11",
+                    "hash" : "0xd06c6e38801154597c29fe25b658246ef192a22ef8583eccb896846b3c3338d5",
+                    "mixHash" : "0x2bfeb4b0fc35fcf5081303f5792bad80a978e81434e115a4bca5d4bb0ce62a76",
+                    "nonce" : "0x8d0938ec98907833",
                     "number" : "0x01",
                     "parentHash" : "0xa26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6",
                     "receiptTrie" : "0x2baee5e20a8ba9840322a73e69073540679f06fd8be716b0a47c28d8805ccde5",
@@ -269,7 +262,7 @@
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa033502c4c63922fca6b527f387ed8442a005b326575fcad3cc5a61ea9f3dfdef2a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca02baee5e20a8ba9840322a73e69073540679f06fd8be716b0a47c28d8805ccde5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a0118d2d66d608352c9c48d44abadf07979b4c317ace88cf34588027cad8d8065e881afa8f0f287a7e11f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa033502c4c63922fca6b527f387ed8442a005b326575fcad3cc5a61ea9f3dfdef2a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca02baee5e20a8ba9840322a73e69073540679f06fd8be716b0a47c28d8805ccde5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a02bfeb4b0fc35fcf5081303f5792bad80a978e81434e115a4bca5d4bb0ce62a76888d0938ec98907833f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -306,7 +299,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097f06e9b6eb04ffc2197b9e2f902aea3accd588b825d7f1a9a305af440bf0beaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5dedb8f1da8809c9cb1d35498abc2002c7c7793e5b983bcf5db7dc0a4588c9ea",
+        "lastblockhash" : "0xd06c6e38801154597c29fe25b658246ef192a22ef8583eccb896846b3c3338d5",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -361,7 +354,7 @@
     "refund_CallToSuicideNoStorage_d1g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideNoStorage_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -373,9 +366,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5ba5",
-                    "hash" : "0x6489e418c8a2e83e4de7330ad93edf083328753ac935c082e6036709d30b6e77",
-                    "mixHash" : "0x84c928fd309136954121a888091d10f789e71660ab61bc7c12d12896c7733592",
-                    "nonce" : "0x454d67584d2bdd1f",
+                    "hash" : "0x30bf0dd0845ad2c7168fa280cb492110d7af878cd3aa12ccef35a8ddc5f85b53",
+                    "mixHash" : "0x79a144a6123117b4196d26f23fb976c36be7ab34f6164019cd186c86142a6bce",
+                    "nonce" : "0x2c0d6f33668b6e6f",
                     "number" : "0x01",
                     "parentHash" : "0xa26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6",
                     "receiptTrie" : "0x2baee5e20a8ba9840322a73e69073540679f06fd8be716b0a47c28d8805ccde5",
@@ -384,7 +377,7 @@
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa033502c4c63922fca6b527f387ed8442a005b326575fcad3cc5a61ea9f3dfdef2a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca02baee5e20a8ba9840322a73e69073540679f06fd8be716b0a47c28d8805ccde5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a084c928fd309136954121a888091d10f789e71660ab61bc7c12d12896c773359288454d67584d2bdd1ff882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa033502c4c63922fca6b527f387ed8442a005b326575fcad3cc5a61ea9f3dfdef2a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca02baee5e20a8ba9840322a73e69073540679f06fd8be716b0a47c28d8805ccde5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a079a144a6123117b4196d26f23fb976c36be7ab34f6164019cd186c86142a6bce882c0d6f33668b6e6ff882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -421,7 +414,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097f06e9b6eb04ffc2197b9e2f902aea3accd588b825d7f1a9a305af440bf0beaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6489e418c8a2e83e4de7330ad93edf083328753ac935c082e6036709d30b6e77",
+        "lastblockhash" : "0x30bf0dd0845ad2c7168fa280cb492110d7af878cd3aa12ccef35a8ddc5f85b53",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -476,7 +469,7 @@
     "refund_CallToSuicideNoStorage_d1g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideNoStorage_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -488,9 +481,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5097",
-                    "hash" : "0xf9653ae6a23f73447e1f4e15d6207ae210092d61868a6c5901a4cc3634b1e1c0",
-                    "mixHash" : "0x533d1e7b518261eac10dc3c0e1da1bd69cec350b23033224ebc8db15981611c6",
-                    "nonce" : "0xeb18a28d9e9313ca",
+                    "hash" : "0xb245aa7d2247d46752f177a504cb9e9e2344fadcea0b60c282b563eaa2c94a53",
+                    "mixHash" : "0x3844805d8f52df71051965dfb65dc72121c11cc66803fb01091b2b2cc511ce84",
+                    "nonce" : "0x0bab9562e554e9bf",
                     "number" : "0x01",
                     "parentHash" : "0xa26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6",
                     "receiptTrie" : "0x4aed715e223b0a97ae25f596341609129ba903602aed59256a2d23b93bdf0a3c",
@@ -499,7 +492,7 @@
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bcd576f06199fb445095610ff21cbf362b6f58dcd419c3b560c377803fedcc6a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca04aed715e223b0a97ae25f596341609129ba903602aed59256a2d23b93bdf0a3cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250978203e880a0533d1e7b518261eac10dc3c0e1da1bd69cec350b23033224ebc8db15981611c688eb18a28d9e9313caf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bcd576f06199fb445095610ff21cbf362b6f58dcd419c3b560c377803fedcc6a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca04aed715e223b0a97ae25f596341609129ba903602aed59256a2d23b93bdf0a3cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250978203e880a03844805d8f52df71051965dfb65dc72121c11cc66803fb01091b2b2cc511ce84880bab9562e554e9bff882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -536,7 +529,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097f06e9b6eb04ffc2197b9e2f902aea3accd588b825d7f1a9a305af440bf0beaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf9653ae6a23f73447e1f4e15d6207ae210092d61868a6c5901a4cc3634b1e1c0",
+        "lastblockhash" : "0xb245aa7d2247d46752f177a504cb9e9e2344fadcea0b60c282b563eaa2c94a53",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -591,7 +584,7 @@
     "refund_CallToSuicideNoStorage_d1g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideNoStorage_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -603,9 +596,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5097",
-                    "hash" : "0x3e2319e0fd4c63eea209a6f0f42edf249dd5b7f21083944a684a46aa110cba41",
-                    "mixHash" : "0x81ebdfbd2f3aed94066cb56ecaecaad9876d4cc0363652e21b29a9de4060cecc",
-                    "nonce" : "0xbd24e7dd4a8abc13",
+                    "hash" : "0xeca1c118f21669be05345c0f1d54415959c52fdc396402299c64c0e9efbf5350",
+                    "mixHash" : "0xf1a0e12d90aa551d5af51ec8edbd62706d5fb5a35b8eb60f7005a298a160d5ae",
+                    "nonce" : "0xf6ba531b40ca0b54",
                     "number" : "0x01",
                     "parentHash" : "0xa26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6",
                     "receiptTrie" : "0x4aed715e223b0a97ae25f596341609129ba903602aed59256a2d23b93bdf0a3c",
@@ -614,7 +607,7 @@
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bcd576f06199fb445095610ff21cbf362b6f58dcd419c3b560c377803fedcc6a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca04aed715e223b0a97ae25f596341609129ba903602aed59256a2d23b93bdf0a3cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250978203e880a081ebdfbd2f3aed94066cb56ecaecaad9876d4cc0363652e21b29a9de4060cecc88bd24e7dd4a8abc13f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a0a26a93aa54cf494a9553cd6f644648724b3d302ed9644bc393b77fe100f515c6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bcd576f06199fb445095610ff21cbf362b6f58dcd419c3b560c377803fedcc6a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca04aed715e223b0a97ae25f596341609129ba903602aed59256a2d23b93bdf0a3cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250978203e880a0f1a0e12d90aa551d5af51ec8edbd62706d5fb5a35b8eb60f7005a298a160d5ae88f6ba531b40ca0b54f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -651,7 +644,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa097f06e9b6eb04ffc2197b9e2f902aea3accd588b825d7f1a9a305af440bf0beaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3e2319e0fd4c63eea209a6f0f42edf249dd5b7f21083944a684a46aa110cba41",
+        "lastblockhash" : "0xeca1c118f21669be05345c0f1d54415959c52fdc396402299c64c0e9efbf5350",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage_d0g0v0.json
index 8aee31818..d23be8bfd 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage_d0g0v0.json
@@ -2,7 +2,7 @@
     "refund_CallToSuicideStorage_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x6b5b",
-                    "hash" : "0xead503647e20108be01ee4823a3a2873b2b4acb64b6b9edfbb7aa5224b10e312",
-                    "mixHash" : "0xf86e31dfa4686b14a439ee0fe28db0a9906268cc9187ab555305af80f6530285",
-                    "nonce" : "0x74c786a555bc89df",
+                    "hash" : "0x87924379b58569e8a3a292cb74de2f4d4b7af5961eeb5dfd30f2ce038b9edd71",
+                    "mixHash" : "0x8026af39d513c2016697d1c91216e4d5ef4422c28abf03d0f303c1506f6391a1",
+                    "nonce" : "0xbbf7f6810ea0db2e",
                     "number" : "0x01",
                     "parentHash" : "0xc69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52b",
                     "receiptTrie" : "0x0c896fedc3d6ff2d36ec21231da77c2591a3a7def71219eed8af4d55e8d51eed",
-                    "stateRoot" : "0x447cd735de27c5ede6d3f37a4947d8ec0bdd882e7254ee9eb1102aa20a1d1b90",
+                    "stateRoot" : "0x71eff8995f9ceaeb2124f57f1ba7310de2b5d3346cfa67080039610f62136da2",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0447cd735de27c5ede6d3f37a4947d8ec0bdd882e7254ee9eb1102aa20a1d1b90a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba00c896fedc3d6ff2d36ec21231da77c2591a3a7def71219eed8af4d55e8d51eedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a0f86e31dfa4686b14a439ee0fe28db0a9906268cc9187ab555305af80f65302858874c786a555bc89dff882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa071eff8995f9ceaeb2124f57f1ba7310de2b5d3346cfa67080039610f62136da2a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba00c896fedc3d6ff2d36ec21231da77c2591a3a7def71219eed8af4d55e8d51eedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a08026af39d513c2016697d1c91216e4d5ef4422c28abf03d0f303c1506f6391a188bbf7f6810ea0db2ef882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0913733cbf9c11709c2db4c1998d1cb8c29de792cb947c5c170105fcf0fd3e7a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xead503647e20108be01ee4823a3a2873b2b4acb64b6b9edfbb7aa5224b10e312",
+        "lastblockhash" : "0x87924379b58569e8a3a292cb74de2f4d4b7af5961eeb5dfd30f2ce038b9edd71",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600055",
@@ -81,7 +74,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f46b5b",
+                "balance" : "0x29a2241af62c6b5b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -132,7 +125,7 @@
     "refund_CallToSuicideStorage_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -144,18 +137,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x6b5b",
-                    "hash" : "0xcc2e1242c192c61cc66d739d2b08567cf85e81d532bd26e83420c5615a344c48",
-                    "mixHash" : "0x72580962e927c7385081bd5be013219b864c4dc1b4579822d8faa49472500a4c",
-                    "nonce" : "0x429f38216f52fa32",
+                    "hash" : "0x6fdf6644cf867faf79d6bbc94c9bc3c409c6e470c1043916ca94d21a7a1b89a7",
+                    "mixHash" : "0x5e0c969a0f6545add689b6156b03e2678c032181de12194e79749a78bfc8e01e",
+                    "nonce" : "0x267cc0e7ef651c5c",
                     "number" : "0x01",
                     "parentHash" : "0xc69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52b",
                     "receiptTrie" : "0x0c896fedc3d6ff2d36ec21231da77c2591a3a7def71219eed8af4d55e8d51eed",
-                    "stateRoot" : "0x447cd735de27c5ede6d3f37a4947d8ec0bdd882e7254ee9eb1102aa20a1d1b90",
+                    "stateRoot" : "0x6e11b0fdb0d7bb4c5fc7e0a5d3aa1e27aab08c9d5f6a2a4ab1510599dc0b6a1b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0447cd735de27c5ede6d3f37a4947d8ec0bdd882e7254ee9eb1102aa20a1d1b90a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba00c896fedc3d6ff2d36ec21231da77c2591a3a7def71219eed8af4d55e8d51eedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a072580962e927c7385081bd5be013219b864c4dc1b4579822d8faa49472500a4c88429f38216f52fa32f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e11b0fdb0d7bb4c5fc7e0a5d3aa1e27aab08c9d5f6a2a4ab1510599dc0b6a1ba05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba00c896fedc3d6ff2d36ec21231da77c2591a3a7def71219eed8af4d55e8d51eedb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a05e0c969a0f6545add689b6156b03e2678c032181de12194e79749a78bfc8e01e88267cc0e7ef651c5cf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -192,7 +185,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0913733cbf9c11709c2db4c1998d1cb8c29de792cb947c5c170105fcf0fd3e7a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcc2e1242c192c61cc66d739d2b08567cf85e81d532bd26e83420c5615a344c48",
+        "lastblockhash" : "0x6fdf6644cf867faf79d6bbc94c9bc3c409c6e470c1043916ca94d21a7a1b89a7",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -211,7 +204,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f46b5b",
+                "balance" : "0x29a2241af62c6b5b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -262,7 +255,7 @@
     "refund_CallToSuicideStorage_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -274,9 +267,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x6b5b",
-                    "hash" : "0x3b868ce2fa16348cbac224e54b112acdbee1170187b6625a8e4aade737e80134",
-                    "mixHash" : "0x66fad4ba94bf7755ac920e594937696580f06150ac385f712b6ef5ac83592d24",
-                    "nonce" : "0x3b89b2c729f8f268",
+                    "hash" : "0x5e2bb0c29d6daa2aa2690dd05c58833742683f520170b591dc00715aa0f2f18a",
+                    "mixHash" : "0xc49e81fb9a5eb7c9de510fdbed6c85b5ffd33fc02e928fc2c59f84b4c057d2db",
+                    "nonce" : "0x715c7ac2ee4493e6",
                     "number" : "0x01",
                     "parentHash" : "0xc69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52b",
                     "receiptTrie" : "0x1d0cb83f8acbc36299345dd45eac743a7a5dcd786a02e720c98abd7d046d3eca",
@@ -285,7 +278,7 @@
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e890003dfb213f52aed52152775aeca0eed96be24d1fcf8cc411d4b10ea78314a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba01d0cb83f8acbc36299345dd45eac743a7a5dcd786a02e720c98abd7d046d3ecab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a066fad4ba94bf7755ac920e594937696580f06150ac385f712b6ef5ac83592d24883b89b2c729f8f268f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e890003dfb213f52aed52152775aeca0eed96be24d1fcf8cc411d4b10ea78314a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba01d0cb83f8acbc36299345dd45eac743a7a5dcd786a02e720c98abd7d046d3ecab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a0c49e81fb9a5eb7c9de510fdbed6c85b5ffd33fc02e928fc2c59f84b4c057d2db88715c7ac2ee4493e6f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -322,7 +315,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0913733cbf9c11709c2db4c1998d1cb8c29de792cb947c5c170105fcf0fd3e7a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3b868ce2fa16348cbac224e54b112acdbee1170187b6625a8e4aade737e80134",
+        "lastblockhash" : "0x5e2bb0c29d6daa2aa2690dd05c58833742683f520170b591dc00715aa0f2f18a",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -385,7 +378,7 @@
     "refund_CallToSuicideStorage_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -397,9 +390,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x6b5b",
-                    "hash" : "0xd75c145a9e3ece37ccc6084e834ba5260acc67e4666d67f2170d307439c7cf23",
-                    "mixHash" : "0x75fee558fcfdbdc8f589b23c68e633f7f54e6ae28498b321acc4aa00503519fe",
-                    "nonce" : "0xde12e9d24d7ac0c1",
+                    "hash" : "0xc39e680ec518a83b311c9e9d3c06037a3f1525c2394168307686530869c60404",
+                    "mixHash" : "0xbd46b73dab5910573f3e35fac6847f6745a31631ab7218ccc9399d3e4e5fb842",
+                    "nonce" : "0x9882870462ae7958",
                     "number" : "0x01",
                     "parentHash" : "0xc69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52b",
                     "receiptTrie" : "0x1d0cb83f8acbc36299345dd45eac743a7a5dcd786a02e720c98abd7d046d3eca",
@@ -408,7 +401,7 @@
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e890003dfb213f52aed52152775aeca0eed96be24d1fcf8cc411d4b10ea78314a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba01d0cb83f8acbc36299345dd45eac743a7a5dcd786a02e720c98abd7d046d3ecab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a075fee558fcfdbdc8f589b23c68e633f7f54e6ae28498b321acc4aa00503519fe88de12e9d24d7ac0c1f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e890003dfb213f52aed52152775aeca0eed96be24d1fcf8cc411d4b10ea78314a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba01d0cb83f8acbc36299345dd45eac743a7a5dcd786a02e720c98abd7d046d3ecab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826b5b8203e880a0bd46b73dab5910573f3e35fac6847f6745a31631ab7218ccc9399d3e4e5fb842889882870462ae7958f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -445,7 +438,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0913733cbf9c11709c2db4c1998d1cb8c29de792cb947c5c170105fcf0fd3e7a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd75c145a9e3ece37ccc6084e834ba5260acc67e4666d67f2170d307439c7cf23",
+        "lastblockhash" : "0xc39e680ec518a83b311c9e9d3c06037a3f1525c2394168307686530869c60404",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -508,7 +501,7 @@
     "refund_CallToSuicideStorage_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -520,9 +513,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x50b7",
-                    "hash" : "0x89ec6b88f5e41123eab5097d546532e2156c58c6ae817f9717096c7e8380075b",
-                    "mixHash" : "0xdcb93415cec85ec992260505431b4dfc0bfba67c8175e6ddf16f4ea093db6f53",
-                    "nonce" : "0x8b076e55bfc8e2e1",
+                    "hash" : "0xf85d407c0d23d83d898800379bb94b59b8e015abd49364b18b3248094cc99b92",
+                    "mixHash" : "0x7a1260b5ce6bfefea11375691da7afa9271849d7bf9a190a0a70ff7cd860bbbe",
+                    "nonce" : "0x6347ae80c07a3a7f",
                     "number" : "0x01",
                     "parentHash" : "0xc69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52b",
                     "receiptTrie" : "0xd74cbd00f66c19de7f9cc6f6529dc48c31c9a4dc1f25c7c780e888218db1145e",
@@ -531,7 +524,7 @@
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e1b2251f193b62f4a4857ff37d38855897c7af48a88e037ae6b522049bc2a6aa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0d74cbd00f66c19de7f9cc6f6529dc48c31c9a4dc1f25c7c780e888218db1145eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250b78203e880a0dcb93415cec85ec992260505431b4dfc0bfba67c8175e6ddf16f4ea093db6f53888b076e55bfc8e2e1f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e1b2251f193b62f4a4857ff37d38855897c7af48a88e037ae6b522049bc2a6aa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0d74cbd00f66c19de7f9cc6f6529dc48c31c9a4dc1f25c7c780e888218db1145eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250b78203e880a07a1260b5ce6bfefea11375691da7afa9271849d7bf9a190a0a70ff7cd860bbbe886347ae80c07a3a7ff882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -568,7 +561,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0913733cbf9c11709c2db4c1998d1cb8c29de792cb947c5c170105fcf0fd3e7a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x89ec6b88f5e41123eab5097d546532e2156c58c6ae817f9717096c7e8380075b",
+        "lastblockhash" : "0xf85d407c0d23d83d898800379bb94b59b8e015abd49364b18b3248094cc99b92",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -624,7 +617,7 @@
     "refund_CallToSuicideStorage_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -636,9 +629,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x50b7",
-                    "hash" : "0xf95fbb9799b5913a2a7275d2305f2758b9ca0e9c5b54333ce471e7c5f5df9c69",
-                    "mixHash" : "0xe80ac2fa39dec6e6dba4ff35792a531e72bbe5166504205c006677ee819f5ffd",
-                    "nonce" : "0x68e7cd1ffd0341fd",
+                    "hash" : "0x2a18627ee4f8549d495480633b96555f59ffb8e780c7a53b5731cf77758e9322",
+                    "mixHash" : "0xe589b522b7a39ccbd66127a914915467cd127c4333b5941eedea73def064f1ad",
+                    "nonce" : "0xcdc75faddd5a725d",
                     "number" : "0x01",
                     "parentHash" : "0xc69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52b",
                     "receiptTrie" : "0xd74cbd00f66c19de7f9cc6f6529dc48c31c9a4dc1f25c7c780e888218db1145e",
@@ -647,7 +640,7 @@
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e1b2251f193b62f4a4857ff37d38855897c7af48a88e037ae6b522049bc2a6aa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0d74cbd00f66c19de7f9cc6f6529dc48c31c9a4dc1f25c7c780e888218db1145eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250b78203e880a0e80ac2fa39dec6e6dba4ff35792a531e72bbe5166504205c006677ee819f5ffd8868e7cd1ffd0341fdf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e1b2251f193b62f4a4857ff37d38855897c7af48a88e037ae6b522049bc2a6aa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0d74cbd00f66c19de7f9cc6f6529dc48c31c9a4dc1f25c7c780e888218db1145eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250b78203e880a0e589b522b7a39ccbd66127a914915467cd127c4333b5941eedea73def064f1ad88cdc75faddd5a725df882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -684,7 +677,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0913733cbf9c11709c2db4c1998d1cb8c29de792cb947c5c170105fcf0fd3e7a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf95fbb9799b5913a2a7275d2305f2758b9ca0e9c5b54333ce471e7c5f5df9c69",
+        "lastblockhash" : "0x2a18627ee4f8549d495480633b96555f59ffb8e780c7a53b5731cf77758e9322",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage_d1g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage_d1g0v0.json
index f3c2ede6a..93d7a4065 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage_d1g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideStorage_d1g0v0.json
@@ -2,7 +2,7 @@
     "refund_CallToSuicideStorage_d1g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideStorage_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5ba5",
-                    "hash" : "0x55e5a8b516981b3a75da39504ad38aa4601354305178dd96de34f3cd90c959d8",
-                    "mixHash" : "0x6764c7e040f9e12152b8d37a8325dcc29a6ecd77819ce81c9815167fcb206532",
-                    "nonce" : "0xf7d8316ca796b968",
+                    "hash" : "0x774141a44f0e2b319b0573835d97049a0fefca019b300636d00eac7da78836de",
+                    "mixHash" : "0x0dc07d2e3e2ab18372eb41e42c66a5dee53a1215ba7499311b4e5abc751ddb1d",
+                    "nonce" : "0xbf311f9a6b5fc648",
                     "number" : "0x01",
                     "parentHash" : "0xc69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52b",
                     "receiptTrie" : "0x72266a13e75386db59178ac5409794ca14df029795264ddc46ffbe93be70ea6f",
-                    "stateRoot" : "0x55751195e47002db8dda08b2db5399c1b0b949b75930a90ac6112785159a0d78",
+                    "stateRoot" : "0x9c23dd1c51e3b3c09c220c1fb86dd6973b482635211dc13f596475ecdd5af2ed",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055751195e47002db8dda08b2db5399c1b0b949b75930a90ac6112785159a0d78a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca072266a13e75386db59178ac5409794ca14df029795264ddc46ffbe93be70ea6fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a06764c7e040f9e12152b8d37a8325dcc29a6ecd77819ce81c9815167fcb20653288f7d8316ca796b968f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c23dd1c51e3b3c09c220c1fb86dd6973b482635211dc13f596475ecdd5af2eda06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca072266a13e75386db59178ac5409794ca14df029795264ddc46ffbe93be70ea6fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a00dc07d2e3e2ab18372eb41e42c66a5dee53a1215ba7499311b4e5abc751ddb1d88bf311f9a6b5fc648f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0913733cbf9c11709c2db4c1998d1cb8c29de792cb947c5c170105fcf0fd3e7a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x55e5a8b516981b3a75da39504ad38aa4601354305178dd96de34f3cd90c959d8",
+        "lastblockhash" : "0x774141a44f0e2b319b0573835d97049a0fefca019b300636d00eac7da78836de",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec8000a",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1600055",
@@ -82,7 +75,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f45ba5",
+                "balance" : "0x29a2241af62c5ba5",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -125,7 +118,7 @@
     "refund_CallToSuicideStorage_d1g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideStorage_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -137,18 +130,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5ba5",
-                    "hash" : "0x3bd05032595e2740b25699737e03452a7f7c0102de45a3929ea2693e5fdb1c88",
-                    "mixHash" : "0xa4852100652aaa1538a3ba111985926c9796c3ab30a01a6aea514596570a158e",
-                    "nonce" : "0x4d7f24ccc3376021",
+                    "hash" : "0x913abf17f7a47ff62d0e1143523b4690fa3401f619ba78e2bc27f7a9c325636a",
+                    "mixHash" : "0x7e6985bd66bf5f38638d082bc605d3d9fea6f24f9f346700d97dcc6837b9540c",
+                    "nonce" : "0x7fd4e00cbf3d6349",
                     "number" : "0x01",
                     "parentHash" : "0xc69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52b",
                     "receiptTrie" : "0x72266a13e75386db59178ac5409794ca14df029795264ddc46ffbe93be70ea6f",
-                    "stateRoot" : "0x55751195e47002db8dda08b2db5399c1b0b949b75930a90ac6112785159a0d78",
+                    "stateRoot" : "0xaa22bd6475c191e4cd7a75ed3faa44f4bfff9b434d2e3546b0433aaa52bbb141",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa055751195e47002db8dda08b2db5399c1b0b949b75930a90ac6112785159a0d78a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca072266a13e75386db59178ac5409794ca14df029795264ddc46ffbe93be70ea6fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a0a4852100652aaa1538a3ba111985926c9796c3ab30a01a6aea514596570a158e884d7f24ccc3376021f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa22bd6475c191e4cd7a75ed3faa44f4bfff9b434d2e3546b0433aaa52bbb141a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca072266a13e75386db59178ac5409794ca14df029795264ddc46ffbe93be70ea6fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a07e6985bd66bf5f38638d082bc605d3d9fea6f24f9f346700d97dcc6837b9540c887fd4e00cbf3d6349f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -185,7 +178,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0913733cbf9c11709c2db4c1998d1cb8c29de792cb947c5c170105fcf0fd3e7a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3bd05032595e2740b25699737e03452a7f7c0102de45a3929ea2693e5fdb1c88",
+        "lastblockhash" : "0x913abf17f7a47ff62d0e1143523b4690fa3401f619ba78e2bc27f7a9c325636a",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -205,7 +198,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f45ba5",
+                "balance" : "0x29a2241af62c5ba5",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -248,7 +241,7 @@
     "refund_CallToSuicideStorage_d1g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideStorage_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -260,9 +253,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5ba5",
-                    "hash" : "0xd13be9ec2690f4381bbc5277cb1cdf67572472306fb478d9add9be40db65262b",
-                    "mixHash" : "0x3041a8f788ba1a57ab3e65e9bd1bae7cd014c48355ee76dc18ff35b95bdf7cd2",
-                    "nonce" : "0x8397111dd49c0c42",
+                    "hash" : "0x256c09f0d57c26bd4028a9638eb607b9fb2a34761a19a0807cbb63d7ecc29827",
+                    "mixHash" : "0x3fe25f691a169cdc33225e8e4d34a4175c26a82556299643343a456bf386f1c4",
+                    "nonce" : "0xbbd409e74d4a929b",
                     "number" : "0x01",
                     "parentHash" : "0xc69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52b",
                     "receiptTrie" : "0x2baee5e20a8ba9840322a73e69073540679f06fd8be716b0a47c28d8805ccde5",
@@ -271,7 +264,7 @@
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa033502c4c63922fca6b527f387ed8442a005b326575fcad3cc5a61ea9f3dfdef2a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca02baee5e20a8ba9840322a73e69073540679f06fd8be716b0a47c28d8805ccde5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a03041a8f788ba1a57ab3e65e9bd1bae7cd014c48355ee76dc18ff35b95bdf7cd2888397111dd49c0c42f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa033502c4c63922fca6b527f387ed8442a005b326575fcad3cc5a61ea9f3dfdef2a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca02baee5e20a8ba9840322a73e69073540679f06fd8be716b0a47c28d8805ccde5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a03fe25f691a169cdc33225e8e4d34a4175c26a82556299643343a456bf386f1c488bbd409e74d4a929bf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -308,7 +301,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0913733cbf9c11709c2db4c1998d1cb8c29de792cb947c5c170105fcf0fd3e7a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd13be9ec2690f4381bbc5277cb1cdf67572472306fb478d9add9be40db65262b",
+        "lastblockhash" : "0x256c09f0d57c26bd4028a9638eb607b9fb2a34761a19a0807cbb63d7ecc29827",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -364,7 +357,7 @@
     "refund_CallToSuicideStorage_d1g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideStorage_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -376,9 +369,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5ba5",
-                    "hash" : "0x14d25674368b368b6d407558777e0fb728e630f36a17223f631a56d653aa9f6b",
-                    "mixHash" : "0x1e7b889baf2a6f3f11bca1e046211f300fccbf59a781ae0149f2e3d145ecdde5",
-                    "nonce" : "0x4fa8cecb5befbb69",
+                    "hash" : "0xc84e4873664d1814246eddbc4d263565b30a4bd236e55de5421a628eefbd1f9d",
+                    "mixHash" : "0x2aeaefd4d996a7d816245aa409a693dcd84e2a30aacbb37cf00e1a32a3d2cb83",
+                    "nonce" : "0xe36c87a4d28d9380",
                     "number" : "0x01",
                     "parentHash" : "0xc69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52b",
                     "receiptTrie" : "0x2baee5e20a8ba9840322a73e69073540679f06fd8be716b0a47c28d8805ccde5",
@@ -387,7 +380,7 @@
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa033502c4c63922fca6b527f387ed8442a005b326575fcad3cc5a61ea9f3dfdef2a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca02baee5e20a8ba9840322a73e69073540679f06fd8be716b0a47c28d8805ccde5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a01e7b889baf2a6f3f11bca1e046211f300fccbf59a781ae0149f2e3d145ecdde5884fa8cecb5befbb69f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa033502c4c63922fca6b527f387ed8442a005b326575fcad3cc5a61ea9f3dfdef2a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca02baee5e20a8ba9840322a73e69073540679f06fd8be716b0a47c28d8805ccde5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680825ba58203e880a02aeaefd4d996a7d816245aa409a693dcd84e2a30aacbb37cf00e1a32a3d2cb8388e36c87a4d28d9380f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -424,7 +417,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0913733cbf9c11709c2db4c1998d1cb8c29de792cb947c5c170105fcf0fd3e7a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x14d25674368b368b6d407558777e0fb728e630f36a17223f631a56d653aa9f6b",
+        "lastblockhash" : "0xc84e4873664d1814246eddbc4d263565b30a4bd236e55de5421a628eefbd1f9d",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -480,7 +473,7 @@
     "refund_CallToSuicideStorage_d1g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideStorage_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -492,9 +485,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5097",
-                    "hash" : "0xf2597c8e3aecbe322d45a0fb81cb424bac17b0add05d3be8016cccf024680825",
-                    "mixHash" : "0xd6e8edfb5d21d4bd48848db3ae1ceb56161d0f18dbe8a5ad3a41f0defebb5d57",
-                    "nonce" : "0xbd5d1485ef155108",
+                    "hash" : "0xecd1810db6ba745dcde621d9ddd9d4f44f75ce6fe88121b7e28cd9e40cad0b20",
+                    "mixHash" : "0x2f1b2ecce6ee3af0a6ef269eba267b5ae42b48cbc3d505e78413a4849314c012",
+                    "nonce" : "0xb935f660ee68dde3",
                     "number" : "0x01",
                     "parentHash" : "0xc69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52b",
                     "receiptTrie" : "0x4aed715e223b0a97ae25f596341609129ba903602aed59256a2d23b93bdf0a3c",
@@ -503,7 +496,7 @@
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bcd576f06199fb445095610ff21cbf362b6f58dcd419c3b560c377803fedcc6a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca04aed715e223b0a97ae25f596341609129ba903602aed59256a2d23b93bdf0a3cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250978203e880a0d6e8edfb5d21d4bd48848db3ae1ceb56161d0f18dbe8a5ad3a41f0defebb5d5788bd5d1485ef155108f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bcd576f06199fb445095610ff21cbf362b6f58dcd419c3b560c377803fedcc6a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca04aed715e223b0a97ae25f596341609129ba903602aed59256a2d23b93bdf0a3cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250978203e880a02f1b2ecce6ee3af0a6ef269eba267b5ae42b48cbc3d505e78413a4849314c01288b935f660ee68dde3f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -540,7 +533,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0913733cbf9c11709c2db4c1998d1cb8c29de792cb947c5c170105fcf0fd3e7a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf2597c8e3aecbe322d45a0fb81cb424bac17b0add05d3be8016cccf024680825",
+        "lastblockhash" : "0xecd1810db6ba745dcde621d9ddd9d4f44f75ce6fe88121b7e28cd9e40cad0b20",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -596,7 +589,7 @@
     "refund_CallToSuicideStorage_d1g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideStorage_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -608,9 +601,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x5097",
-                    "hash" : "0x54a8ca036700a24b6252e1c0878cdad3f2cfe74c373bb5d2d7209fe32909b269",
-                    "mixHash" : "0xc73f852b9916ba0f6c394b0ddffeaed670e654e83f7519ab41adc17209f9ba64",
-                    "nonce" : "0x2e0d5af83d40ba32",
+                    "hash" : "0xc29c46aa8bd41ed4df800d40b36c8a1b2f290985de821b8267b0c7eee379c2bd",
+                    "mixHash" : "0xa6f4c758e55f67284ef2691d3eba0970289589fceecd7224836274296f90e0ed",
+                    "nonce" : "0x00832e2af6153081",
                     "number" : "0x01",
                     "parentHash" : "0xc69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52b",
                     "receiptTrie" : "0x4aed715e223b0a97ae25f596341609129ba903602aed59256a2d23b93bdf0a3c",
@@ -619,7 +612,7 @@
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bcd576f06199fb445095610ff21cbf362b6f58dcd419c3b560c377803fedcc6a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca04aed715e223b0a97ae25f596341609129ba903602aed59256a2d23b93bdf0a3cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250978203e880a0c73f852b9916ba0f6c394b0ddffeaed670e654e83f7519ab41adc17209f9ba64882e0d5af83d40ba32f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a0c69c2b6370d93b049e56828eb3388ade3cf0d895cac760ad7c46d3524442c52ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bcd576f06199fb445095610ff21cbf362b6f58dcd419c3b560c377803fedcc6a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca04aed715e223b0a97ae25f596341609129ba903602aed59256a2d23b93bdf0a3cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250978203e880a0a6f4c758e55f67284ef2691d3eba0970289589fceecd7224836274296f90e0ed8800832e2af6153081f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -656,7 +649,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0913733cbf9c11709c2db4c1998d1cb8c29de792cb947c5c170105fcf0fd3e7a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x54a8ca036700a24b6252e1c0878cdad3f2cfe74c373bb5d2d7209fe32909b269",
+        "lastblockhash" : "0xc29c46aa8bd41ed4df800d40b36c8a1b2f290985de821b8267b0c7eee379c2bd",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice_d0g0v0.json
index 6461ba90f..78d84b478 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice_d0g0v0.json
@@ -2,7 +2,7 @@
     "refund_CallToSuicideTwice_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideTwice_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x7023",
-                    "hash" : "0x6c56dc05e1c1dd50b43a4f40e86e54b671203245304d7cf5b9ba5fdeaf54a6e1",
-                    "mixHash" : "0x43df69cdb77873cd188ce3e11c53228c1aedbe0aab8db5275ffe1f991be1a7dc",
-                    "nonce" : "0x7b0269f318faad6c",
+                    "hash" : "0x787ce1cde88eb0d5a8726112bd53c195cc9f4be6deb93922aaf25a330bc2c474",
+                    "mixHash" : "0x18ad244ec3b0150e17800ab318ae785db33715f1a9c9d355129cf664f8794346",
+                    "nonce" : "0x3553bff4de4ba327",
                     "number" : "0x01",
                     "parentHash" : "0x3610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890",
                     "receiptTrie" : "0xcc234505231854e6860b10f3d2280258115e7fe77c2c547bacfbfb072e8b97b5",
-                    "stateRoot" : "0xa7844b3d724734c4deaa566049ed005299587b991abb43ce7a83e1d236e20bba",
+                    "stateRoot" : "0xfc7cbce15593444aefe0f3dcb9ce37b376734151daa3f2c9bb5e5990aa2a8568",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7844b3d724734c4deaa566049ed005299587b991abb43ce7a83e1d236e20bbaa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0cc234505231854e6860b10f3d2280258115e7fe77c2c547bacfbfb072e8b97b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808270238203e880a043df69cdb77873cd188ce3e11c53228c1aedbe0aab8db5275ffe1f991be1a7dc887b0269f318faad6cf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fc7cbce15593444aefe0f3dcb9ce37b376734151daa3f2c9bb5e5990aa2a8568a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0cc234505231854e6860b10f3d2280258115e7fe77c2c547bacfbfb072e8b97b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808270238203e880a018ad244ec3b0150e17800ab318ae785db33715f1a9c9d355129cf664f8794346883553bff4de4ba327f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fb4a1bcb6ce4b567b2bb523ff56ddf4048f92fe9cf0c3862a1a11234a5e433fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6c56dc05e1c1dd50b43a4f40e86e54b671203245304d7cf5b9ba5fdeaf54a6e1",
+        "lastblockhash" : "0x787ce1cde88eb0d5a8726112bd53c195cc9f4be6deb93922aaf25a330bc2c474",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f16000556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1",
@@ -81,7 +74,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f47023",
+                "balance" : "0x29a2241af62c7023",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -132,7 +125,7 @@
     "refund_CallToSuicideTwice_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideTwice_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -144,18 +137,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x7023",
-                    "hash" : "0xb10e87a43c932dc2d347321fb1b3472bddd72642e7b3beac2e832baad80e9d32",
-                    "mixHash" : "0x9204b199e3a1597c7891fd746d0d4a9f26d86968c383c47d9e5fa3f938efd18d",
-                    "nonce" : "0x2ec5063172539b25",
+                    "hash" : "0xc7b917c47f5bf3ed9e15177c2bb90f3728dfa43320b29b98d3f6eb7f4f178443",
+                    "mixHash" : "0x0c3ef3d732f039bc2db3068c4994ece53fc97b3ecb0895d6c93ef8e1fcda25e9",
+                    "nonce" : "0x5a490a8b07c6d736",
                     "number" : "0x01",
                     "parentHash" : "0x3610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890",
                     "receiptTrie" : "0xcc234505231854e6860b10f3d2280258115e7fe77c2c547bacfbfb072e8b97b5",
-                    "stateRoot" : "0xa7844b3d724734c4deaa566049ed005299587b991abb43ce7a83e1d236e20bba",
+                    "stateRoot" : "0xb2ed3bb6d89b793e1fe57222dd91655bdd3268437974548af224fcd7b183823b",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7844b3d724734c4deaa566049ed005299587b991abb43ce7a83e1d236e20bbaa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0cc234505231854e6860b10f3d2280258115e7fe77c2c547bacfbfb072e8b97b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808270238203e880a09204b199e3a1597c7891fd746d0d4a9f26d86968c383c47d9e5fa3f938efd18d882ec5063172539b25f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b2ed3bb6d89b793e1fe57222dd91655bdd3268437974548af224fcd7b183823ba05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0cc234505231854e6860b10f3d2280258115e7fe77c2c547bacfbfb072e8b97b5b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808270238203e880a00c3ef3d732f039bc2db3068c4994ece53fc97b3ecb0895d6c93ef8e1fcda25e9885a490a8b07c6d736f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -192,7 +185,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fb4a1bcb6ce4b567b2bb523ff56ddf4048f92fe9cf0c3862a1a11234a5e433fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb10e87a43c932dc2d347321fb1b3472bddd72642e7b3beac2e832baad80e9d32",
+        "lastblockhash" : "0xc7b917c47f5bf3ed9e15177c2bb90f3728dfa43320b29b98d3f6eb7f4f178443",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -211,7 +204,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f47023",
+                "balance" : "0x29a2241af62c7023",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -262,7 +255,7 @@
     "refund_CallToSuicideTwice_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideTwice_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -274,9 +267,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x7023",
-                    "hash" : "0x8d2347145e6f11f26d6a061637404c16b608b141876b393ef993a468235696c1",
-                    "mixHash" : "0x59c97057a77b17a9f3cf00c1f46c3a959f44e955663089ac9823ad3b3e23d19e",
-                    "nonce" : "0x25f082fd868eb1f3",
+                    "hash" : "0x0628abc5feacd0886460382258063324ee12275b018daf8a8b697053cf3a945d",
+                    "mixHash" : "0x60d9d6b26c95a0b54b27d03e219372c917988a7dbdfeb9b56d8fae9e884d0f0f",
+                    "nonce" : "0xea84544156295c11",
                     "number" : "0x01",
                     "parentHash" : "0x3610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890",
                     "receiptTrie" : "0xcc7693c847cdc56758df9982978123d487ee7ffb664419ec37d37cb4fa7a955a",
@@ -285,7 +278,7 @@
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341e95489d90215008401ce6f347594c024e61d179f6efd9422d84401ce614a1a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0cc7693c847cdc56758df9982978123d487ee7ffb664419ec37d37cb4fa7a955ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808270238203e880a059c97057a77b17a9f3cf00c1f46c3a959f44e955663089ac9823ad3b3e23d19e8825f082fd868eb1f3f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341e95489d90215008401ce6f347594c024e61d179f6efd9422d84401ce614a1a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0cc7693c847cdc56758df9982978123d487ee7ffb664419ec37d37cb4fa7a955ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808270238203e880a060d9d6b26c95a0b54b27d03e219372c917988a7dbdfeb9b56d8fae9e884d0f0f88ea84544156295c11f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -322,7 +315,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fb4a1bcb6ce4b567b2bb523ff56ddf4048f92fe9cf0c3862a1a11234a5e433fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8d2347145e6f11f26d6a061637404c16b608b141876b393ef993a468235696c1",
+        "lastblockhash" : "0x0628abc5feacd0886460382258063324ee12275b018daf8a8b697053cf3a945d",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -385,7 +378,7 @@
     "refund_CallToSuicideTwice_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideTwice_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -397,9 +390,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x7023",
-                    "hash" : "0x8af43faf7048701e5ee86174c76fac3d1433ab80c44144cc6ba9145ba4d0018f",
-                    "mixHash" : "0xbfc448b9020037b26f4df8f72a519cc8e225d1836b2d02367ef0ce2c84bbb9b0",
-                    "nonce" : "0xbee9174a8aea8f02",
+                    "hash" : "0xc816da18d87661e84d0c62c4adf252c1ee430f0dc0b7bb6aa57d503004683bf6",
+                    "mixHash" : "0x600a49eb7366360885ff8ce315ba994a502a95aaee984788b2856b7af7243175",
+                    "nonce" : "0xb01f6da5b3fb690f",
                     "number" : "0x01",
                     "parentHash" : "0x3610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890",
                     "receiptTrie" : "0xcc7693c847cdc56758df9982978123d487ee7ffb664419ec37d37cb4fa7a955a",
@@ -408,7 +401,7 @@
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341e95489d90215008401ce6f347594c024e61d179f6efd9422d84401ce614a1a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0cc7693c847cdc56758df9982978123d487ee7ffb664419ec37d37cb4fa7a955ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808270238203e880a0bfc448b9020037b26f4df8f72a519cc8e225d1836b2d02367ef0ce2c84bbb9b088bee9174a8aea8f02f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341e95489d90215008401ce6f347594c024e61d179f6efd9422d84401ce614a1a05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba0cc7693c847cdc56758df9982978123d487ee7ffb664419ec37d37cb4fa7a955ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808270238203e880a0600a49eb7366360885ff8ce315ba994a502a95aaee984788b2856b7af724317588b01f6da5b3fb690ff882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -445,7 +438,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fb4a1bcb6ce4b567b2bb523ff56ddf4048f92fe9cf0c3862a1a11234a5e433fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8af43faf7048701e5ee86174c76fac3d1433ab80c44144cc6ba9145ba4d0018f",
+        "lastblockhash" : "0xc816da18d87661e84d0c62c4adf252c1ee430f0dc0b7bb6aa57d503004683bf6",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -508,7 +501,7 @@
     "refund_CallToSuicideTwice_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideTwice_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -520,9 +513,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x50d9",
-                    "hash" : "0xecafc282e849c02ded1e4c5a99a2b6a251cea265a106f7ed3908f08c305c408c",
-                    "mixHash" : "0xe34c3ed6038dea5c1c75eda51b09a5ae326f720bd47b4b7e745f917b25010bcb",
-                    "nonce" : "0xfef61a59af61fadb",
+                    "hash" : "0x9d4c026f0f84e1c56f77ac1546026971eefae4104d2b18eb5a8be14b961fb0c4",
+                    "mixHash" : "0xe23c4f0a7b5c407408957aaaf896650ae66cfbdb380271cd0ceeeeeaf5105a96",
+                    "nonce" : "0x62b6c8003ce6c3c7",
                     "number" : "0x01",
                     "parentHash" : "0x3610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890",
                     "receiptTrie" : "0x6c39c4ae9a27f18798320970d374ce77eb09fa12e20c1c1b53f382625f5a740c",
@@ -531,7 +524,7 @@
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ec3529863fcb5a2ca33cb0adce2e735234c57f6afd6b9598b92c348b6851edaa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba06c39c4ae9a27f18798320970d374ce77eb09fa12e20c1c1b53f382625f5a740cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250d98203e880a0e34c3ed6038dea5c1c75eda51b09a5ae326f720bd47b4b7e745f917b25010bcb88fef61a59af61fadbf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ec3529863fcb5a2ca33cb0adce2e735234c57f6afd6b9598b92c348b6851edaa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba06c39c4ae9a27f18798320970d374ce77eb09fa12e20c1c1b53f382625f5a740cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250d98203e880a0e23c4f0a7b5c407408957aaaf896650ae66cfbdb380271cd0ceeeeeaf5105a968862b6c8003ce6c3c7f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -568,7 +561,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fb4a1bcb6ce4b567b2bb523ff56ddf4048f92fe9cf0c3862a1a11234a5e433fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xecafc282e849c02ded1e4c5a99a2b6a251cea265a106f7ed3908f08c305c408c",
+        "lastblockhash" : "0x9d4c026f0f84e1c56f77ac1546026971eefae4104d2b18eb5a8be14b961fb0c4",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -624,7 +617,7 @@
     "refund_CallToSuicideTwice_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideTwice_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -636,9 +629,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x50d9",
-                    "hash" : "0x58c6e053b5e7aedc1b72c1046b19ca8b862f2453b4bd1239f87088feaf4b673b",
-                    "mixHash" : "0xc58694b5c262fe4140f8a7e8e8e6afa1ed4a52f0927e37c9b963a389872a5c72",
-                    "nonce" : "0x12205d74a5d897a6",
+                    "hash" : "0xfe92c7da080b31d5f15e4d16334e5311476ef6807204ff619887d7cbd2b3ec0e",
+                    "mixHash" : "0x92f2847c5466399428bd02883ea509e4a142496b6493de57d7ec1ca6167b31b8",
+                    "nonce" : "0x8dac2ca5fa8f0fff",
                     "number" : "0x01",
                     "parentHash" : "0x3610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890",
                     "receiptTrie" : "0x6c39c4ae9a27f18798320970d374ce77eb09fa12e20c1c1b53f382625f5a740c",
@@ -647,7 +640,7 @@
                     "transactionsTrie" : "0x5aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ec3529863fcb5a2ca33cb0adce2e735234c57f6afd6b9598b92c348b6851edaa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba06c39c4ae9a27f18798320970d374ce77eb09fa12e20c1c1b53f382625f5a740cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250d98203e880a0c58694b5c262fe4140f8a7e8e8e6afa1ed4a52f0927e37c9b963a389872a5c728812205d74a5d897a6f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
+                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ec3529863fcb5a2ca33cb0adce2e735234c57f6afd6b9598b92c348b6851edaa05aa223482adf3a1a2a459d4ba2cac53424137e086bff91b74ba87245204ebb2ba06c39c4ae9a27f18798320970d374ce77eb09fa12e20c1c1b53f382625f5a740cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250d98203e880a092f2847c5466399428bd02883ea509e4a142496b6493de57d7ec1ca6167b31b8888dac2ca5fa8f0ffff882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000001f41ca00a5b6ccac6bd336c1146cc6edfb0b21ba5480143442860918f5f47d9ae4c28b7a0661f2790b39a4683530bbcc92cb05bd537e423e0be72374cc332cbb0083fde96c0",
                 "transactions" : [
                     {
                         "data" : "0x00000000000000000000000000000000000000000000000000000000000001f4",
@@ -684,7 +677,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fb4a1bcb6ce4b567b2bb523ff56ddf4048f92fe9cf0c3862a1a11234a5e433fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x58c6e053b5e7aedc1b72c1046b19ca8b862f2453b4bd1239f87088feaf4b673b",
+        "lastblockhash" : "0xfe92c7da080b31d5f15e4d16334e5311476ef6807204ff619887d7cbd2b3ec0e",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice_d1g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice_d1g0v0.json
index bdcca5741..3c792b270 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice_d1g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_CallToSuicideTwice_d1g0v0.json
@@ -2,7 +2,7 @@
     "refund_CallToSuicideTwice_d1g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideTwice_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x6fe9",
-                    "hash" : "0x786d7dff0a3ba8647d0bdfcff6986a7431ce2d71b9d11ad46b5ab5a0644c29c5",
-                    "mixHash" : "0x69961bb71aec51effa02a9b5c3a2a1d5baa7186825179160070ce5ca953150f7",
-                    "nonce" : "0x3ac8ead3d8649c47",
+                    "hash" : "0x86ec069474bffce6833fc8c46dd0bdaab9aa3de02e0b111e59a0ee3969b889ea",
+                    "mixHash" : "0x6697ad14ad8280ecaf9f2c276806786ea396d45069cf10c512739cd010264606",
+                    "nonce" : "0x08ab10008bb319a7",
                     "number" : "0x01",
                     "parentHash" : "0x3610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890",
                     "receiptTrie" : "0x84a20fd94e408e2dceb341b74453fe57abdfb71b3b38a438511416300df2a9e4",
-                    "stateRoot" : "0xf0220ad08518502bd29c629607187795ed8aa4b8cf41374cbf53cdcafabce05d",
+                    "stateRoot" : "0x1e637019898d480dd40a9de7858029f7f3c77d2d8b9bccc88b5be822f333aab3",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f0220ad08518502bd29c629607187795ed8aa4b8cf41374cbf53cdcafabce05da06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca084a20fd94e408e2dceb341b74453fe57abdfb71b3b38a438511416300df2a9e4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826fe98203e880a069961bb71aec51effa02a9b5c3a2a1d5baa7186825179160070ce5ca953150f7883ac8ead3d8649c47f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01e637019898d480dd40a9de7858029f7f3c77d2d8b9bccc88b5be822f333aab3a06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca084a20fd94e408e2dceb341b74453fe57abdfb71b3b38a438511416300df2a9e4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826fe98203e880a06697ad14ad8280ecaf9f2c276806786ea396d45069cf10c512739cd0102646068808ab10008bb319a7f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fb4a1bcb6ce4b567b2bb523ff56ddf4048f92fe9cf0c3862a1a11234a5e433fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x786d7dff0a3ba8647d0bdfcff6986a7431ce2d71b9d11ad46b5ab5a0644c29c5",
+        "lastblockhash" : "0x86ec069474bffce6833fc8c46dd0bdaab9aa3de02e0b111e59a0ee3969b889ea",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x1bc16d674ec8000a",
                 "code" : "0x6000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f16000556000600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552aaa600035f1",
@@ -82,7 +75,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f46fe9",
+                "balance" : "0x29a2241af62c6fe9",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -125,7 +118,7 @@
     "refund_CallToSuicideTwice_d1g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideTwice_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -137,18 +130,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x6fe9",
-                    "hash" : "0xc77a32f526c21059ad453ff3160c439f3f0eaaca00f37a5a668a84a5a116f90a",
-                    "mixHash" : "0x7601e1e921981503b3d01967d7a25740a4cd03937aed423712ffed36dad78f15",
-                    "nonce" : "0xeff7ba55f1f42a8a",
+                    "hash" : "0x8e4a2cd0d988d253e851cd74f49bdbac58ce6ab4eb40297a6dddd9c0f757f169",
+                    "mixHash" : "0xd22ee40a86e073f0a61576480d542b08cb119a3e18483b67d02f0d3e442ec376",
+                    "nonce" : "0x886cabd97861ed42",
                     "number" : "0x01",
                     "parentHash" : "0x3610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890",
                     "receiptTrie" : "0x84a20fd94e408e2dceb341b74453fe57abdfb71b3b38a438511416300df2a9e4",
-                    "stateRoot" : "0xf0220ad08518502bd29c629607187795ed8aa4b8cf41374cbf53cdcafabce05d",
+                    "stateRoot" : "0x0e17905d6fe9ff35cde30a963788d95534b3a396cf27160fc631e1d927cbb20e",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f0220ad08518502bd29c629607187795ed8aa4b8cf41374cbf53cdcafabce05da06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca084a20fd94e408e2dceb341b74453fe57abdfb71b3b38a438511416300df2a9e4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826fe98203e880a07601e1e921981503b3d01967d7a25740a4cd03937aed423712ffed36dad78f1588eff7ba55f1f42a8af882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e17905d6fe9ff35cde30a963788d95534b3a396cf27160fc631e1d927cbb20ea06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca084a20fd94e408e2dceb341b74453fe57abdfb71b3b38a438511416300df2a9e4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826fe98203e880a0d22ee40a86e073f0a61576480d542b08cb119a3e18483b67d02f0d3e442ec37688886cabd97861ed42f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -185,7 +178,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fb4a1bcb6ce4b567b2bb523ff56ddf4048f92fe9cf0c3862a1a11234a5e433fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc77a32f526c21059ad453ff3160c439f3f0eaaca00f37a5a668a84a5a116f90a",
+        "lastblockhash" : "0x8e4a2cd0d988d253e851cd74f49bdbac58ce6ab4eb40297a6dddd9c0f757f169",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -205,7 +198,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f46fe9",
+                "balance" : "0x29a2241af62c6fe9",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -248,7 +241,7 @@
     "refund_CallToSuicideTwice_d1g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideTwice_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -260,9 +253,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x6fe9",
-                    "hash" : "0xa2eeb74f57c56835fbb5d366772659741d78ac678341f2df6c0f1bb7c070b3db",
-                    "mixHash" : "0x2744fc36512527f98ad94b2118109f5fc224f7ca4e69fd7996c02a26e009f493",
-                    "nonce" : "0xeca5a6885cb74d56",
+                    "hash" : "0xe8bab9ea700746f1730167a5e9b26c2711113dd4d7b1133c8c24653236cb7389",
+                    "mixHash" : "0x1e1815dbd9a5e4e8176ffe7cfd64b18071a7e51c1196bc158eaa53f6c36bb127",
+                    "nonce" : "0x0343dc1decdf6b3b",
                     "number" : "0x01",
                     "parentHash" : "0x3610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890",
                     "receiptTrie" : "0x246e9d71109080f2ce4bec85a9afab8ab9aaa607526e8be0535b1ea4883c721a",
@@ -271,7 +264,7 @@
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d4035ea114027ffd2e3043241ffa09920ea4befae96eb89abc8010c9eecfe7ea06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca0246e9d71109080f2ce4bec85a9afab8ab9aaa607526e8be0535b1ea4883c721ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826fe98203e880a02744fc36512527f98ad94b2118109f5fc224f7ca4e69fd7996c02a26e009f49388eca5a6885cb74d56f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d4035ea114027ffd2e3043241ffa09920ea4befae96eb89abc8010c9eecfe7ea06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca0246e9d71109080f2ce4bec85a9afab8ab9aaa607526e8be0535b1ea4883c721ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826fe98203e880a01e1815dbd9a5e4e8176ffe7cfd64b18071a7e51c1196bc158eaa53f6c36bb127880343dc1decdf6b3bf882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -308,7 +301,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fb4a1bcb6ce4b567b2bb523ff56ddf4048f92fe9cf0c3862a1a11234a5e433fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa2eeb74f57c56835fbb5d366772659741d78ac678341f2df6c0f1bb7c070b3db",
+        "lastblockhash" : "0xe8bab9ea700746f1730167a5e9b26c2711113dd4d7b1133c8c24653236cb7389",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -364,7 +357,7 @@
     "refund_CallToSuicideTwice_d1g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideTwice_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -376,9 +369,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x6fe9",
-                    "hash" : "0x957a190efd14719638384bd772c75dff000da1b02c874b0e218a1edcc50e6ca7",
-                    "mixHash" : "0xf197b04dcad4f1845bbadd270565633c851a509fd5f5e77b7dd3f6654f035a04",
-                    "nonce" : "0x21a26d7017c98990",
+                    "hash" : "0x51246eef2c628015a4b70b9a160d1d01f0182ca01f88b2664c1322c9a5ff1b11",
+                    "mixHash" : "0xc190d06a4554c97fc6b107d5211e2f7912b90903ab999724485c59ddb2f9abae",
+                    "nonce" : "0x90afe19e265801c0",
                     "number" : "0x01",
                     "parentHash" : "0x3610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890",
                     "receiptTrie" : "0x246e9d71109080f2ce4bec85a9afab8ab9aaa607526e8be0535b1ea4883c721a",
@@ -387,7 +380,7 @@
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d4035ea114027ffd2e3043241ffa09920ea4befae96eb89abc8010c9eecfe7ea06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca0246e9d71109080f2ce4bec85a9afab8ab9aaa607526e8be0535b1ea4883c721ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826fe98203e880a0f197b04dcad4f1845bbadd270565633c851a509fd5f5e77b7dd3f6654f035a048821a26d7017c98990f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d4035ea114027ffd2e3043241ffa09920ea4befae96eb89abc8010c9eecfe7ea06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca0246e9d71109080f2ce4bec85a9afab8ab9aaa607526e8be0535b1ea4883c721ab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680826fe98203e880a0c190d06a4554c97fc6b107d5211e2f7912b90903ab999724485c59ddb2f9abae8890afe19e265801c0f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -424,7 +417,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fb4a1bcb6ce4b567b2bb523ff56ddf4048f92fe9cf0c3862a1a11234a5e433fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x957a190efd14719638384bd772c75dff000da1b02c874b0e218a1edcc50e6ca7",
+        "lastblockhash" : "0x51246eef2c628015a4b70b9a160d1d01f0182ca01f88b2664c1322c9a5ff1b11",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -480,7 +473,7 @@
     "refund_CallToSuicideTwice_d1g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideTwice_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -492,9 +485,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x50b9",
-                    "hash" : "0x09bebe87f3c386fd7e0df30c60efb836906b0994429e7777dc0748f3da49a905",
-                    "mixHash" : "0xbca91893eb3cadb111da16a52aa2a07ebf279765578dc38c698a55bf9ff3f936",
-                    "nonce" : "0xc2798d7a1ca96a44",
+                    "hash" : "0x22897263772b7d2ce7be35e0372d4a44dae7758ea2a01150bc2de5f914152cf2",
+                    "mixHash" : "0x3211bc70f8056c225b4ca684afb124084c788c27ca7219ceb101dac98ed1f113",
+                    "nonce" : "0xdf1e8a27edaa4d11",
                     "number" : "0x01",
                     "parentHash" : "0x3610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890",
                     "receiptTrie" : "0x2e1c169e9a2bcf584996756f33b26bf590b960f174105957812abd9b8f06b472",
@@ -503,7 +496,7 @@
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa081eabe50814ae23a0b826f8c427a7a2e7ee2d77a1a135ab8da4a270c1285856da06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca02e1c169e9a2bcf584996756f33b26bf590b960f174105957812abd9b8f06b472b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250b98203e880a0bca91893eb3cadb111da16a52aa2a07ebf279765578dc38c698a55bf9ff3f93688c2798d7a1ca96a44f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa081eabe50814ae23a0b826f8c427a7a2e7ee2d77a1a135ab8da4a270c1285856da06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca02e1c169e9a2bcf584996756f33b26bf590b960f174105957812abd9b8f06b472b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250b98203e880a03211bc70f8056c225b4ca684afb124084c788c27ca7219ceb101dac98ed1f11388df1e8a27edaa4d11f882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -540,7 +533,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fb4a1bcb6ce4b567b2bb523ff56ddf4048f92fe9cf0c3862a1a11234a5e433fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x09bebe87f3c386fd7e0df30c60efb836906b0994429e7777dc0748f3da49a905",
+        "lastblockhash" : "0x22897263772b7d2ce7be35e0372d4a44dae7758ea2a01150bc2de5f914152cf2",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -596,7 +589,7 @@
     "refund_CallToSuicideTwice_d1g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_CallToSuicideTwice_d1g0v0Filler.json"
         },
         "blocks" : [
@@ -608,9 +601,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x50b9",
-                    "hash" : "0x301e3ef6dc6f474a6be6b223fe7bc036a417bbc072f011a3d19998615d77feae",
-                    "mixHash" : "0xba7306539acf88e3ae197ed285c512b518983c54ce8a36be0ffb98ffd54c10aa",
-                    "nonce" : "0x5ed1f658b320248d",
+                    "hash" : "0x089fb71447ec4a21e1dc223ca62d12ce08e4b4b6a99efd0d732598e86158f7f2",
+                    "mixHash" : "0xeb5ce818a7a227e1918b73cc7c4b512a28c52eb93ddbea2116e0c8155c7cdbaf",
+                    "nonce" : "0x17bcd0b651a76c2d",
                     "number" : "0x01",
                     "parentHash" : "0x3610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890",
                     "receiptTrie" : "0x2e1c169e9a2bcf584996756f33b26bf590b960f174105957812abd9b8f06b472",
@@ -619,7 +612,7 @@
                     "transactionsTrie" : "0x6417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa081eabe50814ae23a0b826f8c427a7a2e7ee2d77a1a135ab8da4a270c1285856da06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca02e1c169e9a2bcf584996756f33b26bf590b960f174105957812abd9b8f06b472b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250b98203e880a0ba7306539acf88e3ae197ed285c512b518983c54ce8a36be0ffb98ffd54c10aa885ed1f658b320248df882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
+                "rlp" : "0xf9027ff901f7a03610a6e9bc58c95295c2521008f901d505be9d0df70c4492c1d100fdf8a8c890a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa081eabe50814ae23a0b826f8c427a7a2e7ee2d77a1a135ab8da4a270c1285856da06417532406065a8b4c1cf8ddcaf1d716331a691134f71ef983b1ea79e6f298cca02e1c169e9a2bcf584996756f33b26bf590b960f174105957812abd9b8f06b472b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808250b98203e880a0eb5ce818a7a227e1918b73cc7c4b512a28c52eb93ddbea2116e0c8155c7cdbaf8817bcd0b651a76c2df882f88080018398968094095e7baea6a6c7c4c2dfeb977efac326af552d870aa000000000000000000000000000000000000000000000000000000000000100001ca07cf650c8b46640cee08fec6eaf2aa358ff40ad53d6d234cc946e5cc768c4b628a07e7a81143236d25fe0f6ddbcc3a42535f19984dadd428aedfe174a7f065b7bccc0",
                 "transactions" : [
                     {
                         "data" : "0x0000000000000000000000000000000000000000000000000000000000010000",
@@ -656,7 +649,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08fb4a1bcb6ce4b567b2bb523ff56ddf4048f92fe9cf0c3862a1a11234a5e433fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x301e3ef6dc6f474a6be6b223fe7bc036a417bbc072f011a3d19998615d77feae",
+        "lastblockhash" : "0x089fb71447ec4a21e1dc223ca62d12ce08e4b4b6a99efd0d732598e86158f7f2",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_NoOOG_1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_NoOOG_1_d0g0v0.json
index f356bf997..47cfe561a 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_NoOOG_1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_NoOOG_1_d0g0v0.json
@@ -2,7 +2,7 @@
     "refund_NoOOG_1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_NoOOG_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x32cb",
-                    "hash" : "0x093112f4d9a08c1b8cccac042447acf5649eb3c567763a93b3b4b7fbf599555d",
-                    "mixHash" : "0x680ebd5a53773e45d6b2dec60e4f236443a607a406133063a0012cd3e664e7ab",
-                    "nonce" : "0x816cde83547243c4",
+                    "hash" : "0x3d904fe619c8468fd87d960afe9a72211e686357e49a467270dc46357a471998",
+                    "mixHash" : "0x21376af170828031e517ce85179068530d48a28e655af87992036bddaa5f39d0",
+                    "nonce" : "0xccf7ddef20010a47",
                     "number" : "0x01",
                     "parentHash" : "0x86c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489c",
                     "receiptTrie" : "0xbf746beefa19da059d5810cb7b32cde1e5afa402222d0cbeea17736d3f724c70",
-                    "stateRoot" : "0xa7e86504ca0688e4f195b6640b3028cf6fb56739ccda34e94a90fae8300e871c",
+                    "stateRoot" : "0xf08215bdc7ccdc70b06bd54f5dc67e7a0376e63cb2afe6fba64b1a809e4257ef",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xdff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a086c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7e86504ca0688e4f195b6640b3028cf6fb56739ccda34e94a90fae8300e871ca0dff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8ca0bf746beefa19da059d5810cb7b32cde1e5afa402222d0cbeea17736d3f724c70b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408232cb8203e880a0680ebd5a53773e45d6b2dec60e4f236443a607a406133063a0012cd3e664e7ab88816cde83547243c4f861f85f800182659694095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c44cd47f9661b5eb3d291053e0a2a2b1d63680a11abfd203a27cf7254a0e974fa01a548adb89e3a5ec1c812e810b127924c40de8e7ddd7c6a84b52e132481b69a0c0",
+                "rlp" : "0xf9025ef901f7a086c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f08215bdc7ccdc70b06bd54f5dc67e7a0376e63cb2afe6fba64b1a809e4257efa0dff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8ca0bf746beefa19da059d5810cb7b32cde1e5afa402222d0cbeea17736d3f724c70b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408232cb8203e880a021376af170828031e517ce85179068530d48a28e655af87992036bddaa5f39d088ccf7ddef20010a47f861f85f800182659694095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c44cd47f9661b5eb3d291053e0a2a2b1d63680a11abfd203a27cf7254a0e974fa01a548adb89e3a5ec1c812e810b127924c40de8e7ddd7c6a84b52e132481b69a0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0922b9a9d20dd323e25ba37936527d2e5d98df97bb97635cbaf4f599840323170a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x093112f4d9a08c1b8cccac042447acf5649eb3c567763a93b3b4b7fbf599555d",
+        "lastblockhash" : "0x3d904fe619c8468fd87d960afe9a72211e686357e49a467270dc46357a471998",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600155",
@@ -80,7 +73,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f432cb",
+                "balance" : "0x29a2241af62c32cb",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -115,7 +108,7 @@
     "refund_NoOOG_1_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_NoOOG_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -127,18 +120,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x32cb",
-                    "hash" : "0xf9bd0c865208eceeb29124dd6773e72fc054f2ee4bc6aa5b6ebea90802b5989c",
-                    "mixHash" : "0xb61467a74301e0019b620a2f407025d6971a5f9406932d78abf220ff0a20ca92",
-                    "nonce" : "0xe22cb23a83ebf4ad",
+                    "hash" : "0xf35e3d77540a57292945753237533f5841b2cd9eb7cc28a4d9c0c2a6f1eed122",
+                    "mixHash" : "0xc048ca2bf585bedf46cb27c438f0638f7eee454641ad7564d75b187a1cb6de39",
+                    "nonce" : "0x4286120e9431cefb",
                     "number" : "0x01",
                     "parentHash" : "0x86c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489c",
                     "receiptTrie" : "0xbf746beefa19da059d5810cb7b32cde1e5afa402222d0cbeea17736d3f724c70",
-                    "stateRoot" : "0xa7e86504ca0688e4f195b6640b3028cf6fb56739ccda34e94a90fae8300e871c",
+                    "stateRoot" : "0xd36689bbae36e258e5cb7f0caed3cb81e8b49e82eb13499a29646e13fffa2295",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xdff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a086c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a7e86504ca0688e4f195b6640b3028cf6fb56739ccda34e94a90fae8300e871ca0dff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8ca0bf746beefa19da059d5810cb7b32cde1e5afa402222d0cbeea17736d3f724c70b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408232cb8203e880a0b61467a74301e0019b620a2f407025d6971a5f9406932d78abf220ff0a20ca9288e22cb23a83ebf4adf861f85f800182659694095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c44cd47f9661b5eb3d291053e0a2a2b1d63680a11abfd203a27cf7254a0e974fa01a548adb89e3a5ec1c812e810b127924c40de8e7ddd7c6a84b52e132481b69a0c0",
+                "rlp" : "0xf9025ef901f7a086c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d36689bbae36e258e5cb7f0caed3cb81e8b49e82eb13499a29646e13fffa2295a0dff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8ca0bf746beefa19da059d5810cb7b32cde1e5afa402222d0cbeea17736d3f724c70b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408232cb8203e880a0c048ca2bf585bedf46cb27c438f0638f7eee454641ad7564d75b187a1cb6de39884286120e9431cefbf861f85f800182659694095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c44cd47f9661b5eb3d291053e0a2a2b1d63680a11abfd203a27cf7254a0e974fa01a548adb89e3a5ec1c812e810b127924c40de8e7ddd7c6a84b52e132481b69a0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -175,7 +168,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0922b9a9d20dd323e25ba37936527d2e5d98df97bb97635cbaf4f599840323170a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf9bd0c865208eceeb29124dd6773e72fc054f2ee4bc6aa5b6ebea90802b5989c",
+        "lastblockhash" : "0xf35e3d77540a57292945753237533f5841b2cd9eb7cc28a4d9c0c2a6f1eed122",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -193,7 +186,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f432cb",
+                "balance" : "0x29a2241af62c32cb",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -228,7 +221,7 @@
     "refund_NoOOG_1_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_NoOOG_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -240,9 +233,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x32cb",
-                    "hash" : "0xe53688635a31c0930a0f9307dd9cce994bab2a3f7ec352f145c8600483a4d0d5",
-                    "mixHash" : "0x7b41e1e3316024257da1ff4f5bd82e84bfde6474d930500ca83cf5f95012336b",
-                    "nonce" : "0x848a8c8eb2b3a165",
+                    "hash" : "0xef5f6829a7a380dc60110e705b300996aff72e3cac51d4188bb8ed3785b83e78",
+                    "mixHash" : "0x134ff4cb690bb124a0c46219a04ab7f940f58d69894d23bcc0a64ebd8db2502b",
+                    "nonce" : "0xfc7796ac87b9c2e1",
                     "number" : "0x01",
                     "parentHash" : "0x86c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489c",
                     "receiptTrie" : "0xe42dd64bbe84c58b43411fa38a6dc55dff569c4abbc12194b550378021911e27",
@@ -251,7 +244,7 @@
                     "transactionsTrie" : "0xdff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a086c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a3b9e13b008727c13709eb12a2d07bdddcfd4a7fc9a37dbacdd3bc722d7d5eda0dff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8ca0e42dd64bbe84c58b43411fa38a6dc55dff569c4abbc12194b550378021911e27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408232cb8203e880a07b41e1e3316024257da1ff4f5bd82e84bfde6474d930500ca83cf5f95012336b88848a8c8eb2b3a165f861f85f800182659694095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c44cd47f9661b5eb3d291053e0a2a2b1d63680a11abfd203a27cf7254a0e974fa01a548adb89e3a5ec1c812e810b127924c40de8e7ddd7c6a84b52e132481b69a0c0",
+                "rlp" : "0xf9025ef901f7a086c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a3b9e13b008727c13709eb12a2d07bdddcfd4a7fc9a37dbacdd3bc722d7d5eda0dff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8ca0e42dd64bbe84c58b43411fa38a6dc55dff569c4abbc12194b550378021911e27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408232cb8203e880a0134ff4cb690bb124a0c46219a04ab7f940f58d69894d23bcc0a64ebd8db2502b88fc7796ac87b9c2e1f861f85f800182659694095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c44cd47f9661b5eb3d291053e0a2a2b1d63680a11abfd203a27cf7254a0e974fa01a548adb89e3a5ec1c812e810b127924c40de8e7ddd7c6a84b52e132481b69a0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -288,7 +281,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0922b9a9d20dd323e25ba37936527d2e5d98df97bb97635cbaf4f599840323170a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe53688635a31c0930a0f9307dd9cce994bab2a3f7ec352f145c8600483a4d0d5",
+        "lastblockhash" : "0xef5f6829a7a380dc60110e705b300996aff72e3cac51d4188bb8ed3785b83e78",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -334,7 +327,7 @@
     "refund_NoOOG_1_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_NoOOG_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -346,9 +339,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x32cb",
-                    "hash" : "0x0a8d810a7376943dbd6290c9cec28227149b69c10d66780b818c29ed3a720e92",
-                    "mixHash" : "0xc59075ee25318ac7a2e643e9fe1e3201223f15d61e1f55c819f5290994bc4d72",
-                    "nonce" : "0x3233066345b16218",
+                    "hash" : "0x989055809ae2f0b5cb198c2450fafcd1741c841b44e64fc218ac86dcdfbc320b",
+                    "mixHash" : "0x1c891d437cd90e1772933a0f7e45902fe3494f4d2a138d5ef61e54aa34015e1f",
+                    "nonce" : "0x2de1c5da68722d7d",
                     "number" : "0x01",
                     "parentHash" : "0x86c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489c",
                     "receiptTrie" : "0xe42dd64bbe84c58b43411fa38a6dc55dff569c4abbc12194b550378021911e27",
@@ -357,7 +350,7 @@
                     "transactionsTrie" : "0xdff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a086c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a3b9e13b008727c13709eb12a2d07bdddcfd4a7fc9a37dbacdd3bc722d7d5eda0dff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8ca0e42dd64bbe84c58b43411fa38a6dc55dff569c4abbc12194b550378021911e27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408232cb8203e880a0c59075ee25318ac7a2e643e9fe1e3201223f15d61e1f55c819f5290994bc4d72883233066345b16218f861f85f800182659694095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c44cd47f9661b5eb3d291053e0a2a2b1d63680a11abfd203a27cf7254a0e974fa01a548adb89e3a5ec1c812e810b127924c40de8e7ddd7c6a84b52e132481b69a0c0",
+                "rlp" : "0xf9025ef901f7a086c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a3b9e13b008727c13709eb12a2d07bdddcfd4a7fc9a37dbacdd3bc722d7d5eda0dff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8ca0e42dd64bbe84c58b43411fa38a6dc55dff569c4abbc12194b550378021911e27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408232cb8203e880a01c891d437cd90e1772933a0f7e45902fe3494f4d2a138d5ef61e54aa34015e1f882de1c5da68722d7df861f85f800182659694095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c44cd47f9661b5eb3d291053e0a2a2b1d63680a11abfd203a27cf7254a0e974fa01a548adb89e3a5ec1c812e810b127924c40de8e7ddd7c6a84b52e132481b69a0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -394,7 +387,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0922b9a9d20dd323e25ba37936527d2e5d98df97bb97635cbaf4f599840323170a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0a8d810a7376943dbd6290c9cec28227149b69c10d66780b818c29ed3a720e92",
+        "lastblockhash" : "0x989055809ae2f0b5cb198c2450fafcd1741c841b44e64fc218ac86dcdfbc320b",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -440,7 +433,7 @@
     "refund_NoOOG_1_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_NoOOG_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -452,9 +445,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x32cb",
-                    "hash" : "0xdb11f1e20674baa7c6efe8f789eb4251bc206f310f5cd503d199a4d1e3567c4a",
-                    "mixHash" : "0xb4633b0c42bad33390645f8f68d0b39a4e603796c44d31789adc89cb9f4624df",
-                    "nonce" : "0x01552cd7cd8b1547",
+                    "hash" : "0xf4e0f0d1055de2c0a8be396faf9bff647d0c8feefb5a664298283c8aea88d69c",
+                    "mixHash" : "0x9522ebf64e18adc59517594cf9b51355b117c9193f5bfd2fa57bec25cd547c6c",
+                    "nonce" : "0xb0afab5d10d21fbd",
                     "number" : "0x01",
                     "parentHash" : "0x86c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489c",
                     "receiptTrie" : "0xe42dd64bbe84c58b43411fa38a6dc55dff569c4abbc12194b550378021911e27",
@@ -463,7 +456,7 @@
                     "transactionsTrie" : "0xdff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a086c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a3b9e13b008727c13709eb12a2d07bdddcfd4a7fc9a37dbacdd3bc722d7d5eda0dff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8ca0e42dd64bbe84c58b43411fa38a6dc55dff569c4abbc12194b550378021911e27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408232cb8203e880a0b4633b0c42bad33390645f8f68d0b39a4e603796c44d31789adc89cb9f4624df8801552cd7cd8b1547f861f85f800182659694095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c44cd47f9661b5eb3d291053e0a2a2b1d63680a11abfd203a27cf7254a0e974fa01a548adb89e3a5ec1c812e810b127924c40de8e7ddd7c6a84b52e132481b69a0c0",
+                "rlp" : "0xf9025ef901f7a086c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a3b9e13b008727c13709eb12a2d07bdddcfd4a7fc9a37dbacdd3bc722d7d5eda0dff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8ca0e42dd64bbe84c58b43411fa38a6dc55dff569c4abbc12194b550378021911e27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408232cb8203e880a09522ebf64e18adc59517594cf9b51355b117c9193f5bfd2fa57bec25cd547c6c88b0afab5d10d21fbdf861f85f800182659694095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c44cd47f9661b5eb3d291053e0a2a2b1d63680a11abfd203a27cf7254a0e974fa01a548adb89e3a5ec1c812e810b127924c40de8e7ddd7c6a84b52e132481b69a0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -500,7 +493,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0922b9a9d20dd323e25ba37936527d2e5d98df97bb97635cbaf4f599840323170a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdb11f1e20674baa7c6efe8f789eb4251bc206f310f5cd503d199a4d1e3567c4a",
+        "lastblockhash" : "0xf4e0f0d1055de2c0a8be396faf9bff647d0c8feefb5a664298283c8aea88d69c",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -546,7 +539,7 @@
     "refund_NoOOG_1_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_NoOOG_1_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -558,9 +551,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x32cb",
-                    "hash" : "0x0a8f61f5b54895476d00780b971fe82a5795698f0aa02dd3b98dd6364f453a3e",
-                    "mixHash" : "0x512d20569fccf2789946389309a64faacaedec42be4132f44fe090875d37e074",
-                    "nonce" : "0xe2e0c377dc3e6a2f",
+                    "hash" : "0x4ccdbffd1e48bbe526dbe8d3795e5b44b6953d91f7c9e130148f795a332f23f3",
+                    "mixHash" : "0x5c17a6bd885dd05543c5981e9e9f11a184d3af3a1b0b4a83a205aaaa915db9e1",
+                    "nonce" : "0xe2a6d5806a77db78",
                     "number" : "0x01",
                     "parentHash" : "0x86c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489c",
                     "receiptTrie" : "0xe42dd64bbe84c58b43411fa38a6dc55dff569c4abbc12194b550378021911e27",
@@ -569,7 +562,7 @@
                     "transactionsTrie" : "0xdff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8c",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a086c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a3b9e13b008727c13709eb12a2d07bdddcfd4a7fc9a37dbacdd3bc722d7d5eda0dff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8ca0e42dd64bbe84c58b43411fa38a6dc55dff569c4abbc12194b550378021911e27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408232cb8203e880a0512d20569fccf2789946389309a64faacaedec42be4132f44fe090875d37e07488e2e0c377dc3e6a2ff861f85f800182659694095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c44cd47f9661b5eb3d291053e0a2a2b1d63680a11abfd203a27cf7254a0e974fa01a548adb89e3a5ec1c812e810b127924c40de8e7ddd7c6a84b52e132481b69a0c0",
+                "rlp" : "0xf9025ef901f7a086c8b4f0dd3c2f62731dac19168bd66df9f787c833fafc6910c77e7ef9be489ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a3b9e13b008727c13709eb12a2d07bdddcfd4a7fc9a37dbacdd3bc722d7d5eda0dff45b1930feaf9a5f3ad5f3de43526ef9f483d9d4ce5287ff22f1ae8218ab8ca0e42dd64bbe84c58b43411fa38a6dc55dff569c4abbc12194b550378021911e27b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408232cb8203e880a05c17a6bd885dd05543c5981e9e9f11a184d3af3a1b0b4a83a205aaaa915db9e188e2a6d5806a77db78f861f85f800182659694095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c44cd47f9661b5eb3d291053e0a2a2b1d63680a11abfd203a27cf7254a0e974fa01a548adb89e3a5ec1c812e810b127924c40de8e7ddd7c6a84b52e132481b69a0c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -606,7 +599,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0922b9a9d20dd323e25ba37936527d2e5d98df97bb97635cbaf4f599840323170a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0a8f61f5b54895476d00780b971fe82a5795698f0aa02dd3b98dd6364f453a3e",
+        "lastblockhash" : "0x4ccdbffd1e48bbe526dbe8d3795e5b44b6953d91f7c9e130148f795a332f23f3",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_OOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_OOG_d0g0v0.json
index cd1d4bf02..83e36a6f1 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_OOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_OOG_d0g0v0.json
@@ -2,7 +2,7 @@
     "refund_OOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x6595",
-                    "hash" : "0xbc12b09e0f60a6aa811e37407f8b33d9c73e4dcdc93739b8db6c75e94a54cff8",
-                    "mixHash" : "0xe2d74bbd3832a5063d18fd594ae320c8382ca9cb044f0f39cde41d821d1412a9",
-                    "nonce" : "0x59d62a639cf1512c",
+                    "hash" : "0xa7e25f71821178e7dcab96ce586cf22ce51cae6d12f80da56ee852d60e859d7a",
+                    "mixHash" : "0x44c9dc58cf8765d968850cead85cbe273e665a124e4840af1ca3707c2da08910",
+                    "nonce" : "0x80e75d2021979b0e",
                     "number" : "0x01",
                     "parentHash" : "0x9760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1b",
                     "receiptTrie" : "0x2ccae62a76d2f9dafaaeabd1d1be41f894b18afa5b5ec55d302acc1688a2aaaa",
-                    "stateRoot" : "0xd655f4a9d4534b83b104a318c68cdedaa7522adfdce960a07818cb5b52b62703",
+                    "stateRoot" : "0xa4a30949b20cd617a271e82a49279aa0598c45d4f926a809d079180947b1d531",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d655f4a9d4534b83b104a318c68cdedaa7522adfdce960a07818cb5b52b62703a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da02ccae62a76d2f9dafaaeabd1d1be41f894b18afa5b5ec55d302acc1688a2aaaab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a0e2d74bbd3832a5063d18fd594ae320c8382ca9cb044f0f39cde41d821d1412a98859d62a639cf1512cf861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
+                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a4a30949b20cd617a271e82a49279aa0598c45d4f926a809d079180947b1d531a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da02ccae62a76d2f9dafaaeabd1d1be41f894b18afa5b5ec55d302acc1688a2aaaab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a044c9dc58cf8765d968850cead85cbe273e665a124e4840af1ca3707c2da089108880e75d2021979b0ef861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffe1435521fde24b7bdf5b873bbfdaf2db33a9df4f39e3a0021fdebdab0c1612a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbc12b09e0f60a6aa811e37407f8b33d9c73e4dcdc93739b8db6c75e94a54cff8",
+        "lastblockhash" : "0xa7e25f71821178e7dcab96ce586cf22ce51cae6d12f80da56ee852d60e859d7a",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6000600155",
@@ -81,7 +74,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f46595",
+                "balance" : "0x29a2241af62c6595",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -116,7 +109,7 @@
     "refund_OOG_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +121,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x6595",
-                    "hash" : "0x0d113883aece06ea5dd107f6a62de9732263287ca800f1801fb811297f9f76d2",
-                    "mixHash" : "0x0461a1301b44cd530d1e321ecfda5c9ad51cfb796e1b9e028dc1d9bd536fb2b9",
-                    "nonce" : "0xf40fdaedd03c5781",
+                    "hash" : "0x3ffaa4b93392d9a03d04e825389ddcbbf9cf086466fc6bef5d8a4365bbf48e2e",
+                    "mixHash" : "0x19ed7f32fb28a7e756226b3412e597fb6e08476b778beae86daea86436d0fa58",
+                    "nonce" : "0x4bd4a6f491d9c10a",
                     "number" : "0x01",
                     "parentHash" : "0x9760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1b",
                     "receiptTrie" : "0x2ccae62a76d2f9dafaaeabd1d1be41f894b18afa5b5ec55d302acc1688a2aaaa",
-                    "stateRoot" : "0xd655f4a9d4534b83b104a318c68cdedaa7522adfdce960a07818cb5b52b62703",
+                    "stateRoot" : "0xd6ad504a71e7203910e90da44ea7aa83ddfab30f6742535830bc9d8f978e8c12",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0xe6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d655f4a9d4534b83b104a318c68cdedaa7522adfdce960a07818cb5b52b62703a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da02ccae62a76d2f9dafaaeabd1d1be41f894b18afa5b5ec55d302acc1688a2aaaab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a00461a1301b44cd530d1e321ecfda5c9ad51cfb796e1b9e028dc1d9bd536fb2b988f40fdaedd03c5781f861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
+                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d6ad504a71e7203910e90da44ea7aa83ddfab30f6742535830bc9d8f978e8c12a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da02ccae62a76d2f9dafaaeabd1d1be41f894b18afa5b5ec55d302acc1688a2aaaab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a019ed7f32fb28a7e756226b3412e597fb6e08476b778beae86daea86436d0fa58884bd4a6f491d9c10af861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,7 +169,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffe1435521fde24b7bdf5b873bbfdaf2db33a9df4f39e3a0021fdebdab0c1612a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0d113883aece06ea5dd107f6a62de9732263287ca800f1801fb811297f9f76d2",
+        "lastblockhash" : "0x3ffaa4b93392d9a03d04e825389ddcbbf9cf086466fc6bef5d8a4365bbf48e2e",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -195,7 +188,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f46595",
+                "balance" : "0x29a2241af62c6595",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -230,7 +223,7 @@
     "refund_OOG_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -242,9 +235,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x6595",
-                    "hash" : "0xbcd4e57f7688e619160d59fe27af7f3b7e0d619bfe77202a3b0d0e02988232a1",
-                    "mixHash" : "0x51630dcb22c15b43afd4b3fc279d2123b65ccc265f2e0820eeebc602f3c728ab",
-                    "nonce" : "0x2a4747fe2f111751",
+                    "hash" : "0x922c2a2e5a78930e17be67fa89e928cc23f6321cb5da335b30890b693d7fd0f2",
+                    "mixHash" : "0x80aba8fffa78f19c06751649d57515b32aefaadf5c1bc83766829db7ab6d2702",
+                    "nonce" : "0xb7c64b0fe33f3ea9",
                     "number" : "0x01",
                     "parentHash" : "0x9760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1b",
                     "receiptTrie" : "0xc4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1",
@@ -253,7 +246,7 @@
                     "transactionsTrie" : "0xe6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da0c4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a051630dcb22c15b43afd4b3fc279d2123b65ccc265f2e0820eeebc602f3c728ab882a4747fe2f111751f861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
+                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da0c4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a080aba8fffa78f19c06751649d57515b32aefaadf5c1bc83766829db7ab6d270288b7c64b0fe33f3ea9f861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -290,7 +283,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffe1435521fde24b7bdf5b873bbfdaf2db33a9df4f39e3a0021fdebdab0c1612a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbcd4e57f7688e619160d59fe27af7f3b7e0d619bfe77202a3b0d0e02988232a1",
+        "lastblockhash" : "0x922c2a2e5a78930e17be67fa89e928cc23f6321cb5da335b30890b693d7fd0f2",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -337,7 +330,7 @@
     "refund_OOG_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -349,9 +342,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x6595",
-                    "hash" : "0xace4cf4565fc085f96a8b25c9e65d8a143bb49debb98939d319fc77e2d898d8c",
-                    "mixHash" : "0x6ca4f9e5f2a0c29e8517483ddae0fba2ab143a2369e4a5a8640c32c254b16a57",
-                    "nonce" : "0x6418df4a20178008",
+                    "hash" : "0x9e8daa377e4e334e42f696fcf0bab547647e0d381f331d06c9042ccc8d73c585",
+                    "mixHash" : "0x2fa14875985338fef1d3fe45dc2f53f9f2bc3fbdd3ea63bb0f142d4f71700f02",
+                    "nonce" : "0x0218e35d1dc3aff8",
                     "number" : "0x01",
                     "parentHash" : "0x9760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1b",
                     "receiptTrie" : "0xc4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1",
@@ -360,7 +353,7 @@
                     "transactionsTrie" : "0xe6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da0c4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a06ca4f9e5f2a0c29e8517483ddae0fba2ab143a2369e4a5a8640c32c254b16a57886418df4a20178008f861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
+                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da0c4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a02fa14875985338fef1d3fe45dc2f53f9f2bc3fbdd3ea63bb0f142d4f71700f02880218e35d1dc3aff8f861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -397,7 +390,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffe1435521fde24b7bdf5b873bbfdaf2db33a9df4f39e3a0021fdebdab0c1612a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xace4cf4565fc085f96a8b25c9e65d8a143bb49debb98939d319fc77e2d898d8c",
+        "lastblockhash" : "0x9e8daa377e4e334e42f696fcf0bab547647e0d381f331d06c9042ccc8d73c585",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -444,7 +437,7 @@
     "refund_OOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -456,9 +449,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x6595",
-                    "hash" : "0xdc77a4d1952a6111da11af15d2c751a7912ee54c23380f3d7d4604aba353bf85",
-                    "mixHash" : "0x7f68dffd4eba2964a1b1d9e009996f23d1ede66d1addc9c7b17ffbdcd9e779b3",
-                    "nonce" : "0x6807b005d0d2f29d",
+                    "hash" : "0x9c8bdea3e0622750ddc14497ed8a311725187559d76c6857115687f6da7ff569",
+                    "mixHash" : "0x12be67c14715b035e0cc20700338116ed8c8b953575c1aed418994ee1682d738",
+                    "nonce" : "0xec30cd70b25c799e",
                     "number" : "0x01",
                     "parentHash" : "0x9760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1b",
                     "receiptTrie" : "0xc4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1",
@@ -467,7 +460,7 @@
                     "transactionsTrie" : "0xe6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da0c4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a07f68dffd4eba2964a1b1d9e009996f23d1ede66d1addc9c7b17ffbdcd9e779b3886807b005d0d2f29df861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
+                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da0c4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a012be67c14715b035e0cc20700338116ed8c8b953575c1aed418994ee1682d73888ec30cd70b25c799ef861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -504,7 +497,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffe1435521fde24b7bdf5b873bbfdaf2db33a9df4f39e3a0021fdebdab0c1612a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdc77a4d1952a6111da11af15d2c751a7912ee54c23380f3d7d4604aba353bf85",
+        "lastblockhash" : "0x9c8bdea3e0622750ddc14497ed8a311725187559d76c6857115687f6da7ff569",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -551,7 +544,7 @@
     "refund_OOG_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_OOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -563,9 +556,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x6595",
-                    "hash" : "0x3684310742858fdb2f161afa2340e351cf6c118e86e014262accc21e79319031",
-                    "mixHash" : "0x80b0518a4470708f4f4e33abcc981d80bccc7ac0e88830a7180adce0d32e4fa4",
-                    "nonce" : "0xbed4ee7c8df37b73",
+                    "hash" : "0xf38360409f4d6faa1d0bfdc0fb73e473e959c383f25fc55ec024a442d9af4f8d",
+                    "mixHash" : "0x64d66c9350f1262353de9d8dabebb33560487d488493d2f6d0bdc9db090c2811",
+                    "nonce" : "0x5e020a5898e1841a",
                     "number" : "0x01",
                     "parentHash" : "0x9760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1b",
                     "receiptTrie" : "0xc4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1",
@@ -574,7 +567,7 @@
                     "transactionsTrie" : "0xe6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da0c4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a080b0518a4470708f4f4e33abcc981d80bccc7ac0e88830a7180adce0d32e4fa488bed4ee7c8df37b73f861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
+                "rlp" : "0xf9025ef901f7a09760fdae6dbbf00b41c834a76de2f63a12c6d5d26df707ffed7119f79e14fd1ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088312360ef0b77fe3586e4006873e4fa6ebfc9d77b215a0c3b2cde5995144de2a0e6b56fcfd91b26595e7f5f808680b9134b5d4500e9876d845b3a5dcbd0fb089da0c4c10fc35a174b35e68750553db3e1a1f8283f97608a9da88b7a4bf43b7352c1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265958203e880a064d66c9350f1262353de9d8dabebb33560487d488493d2f6d0bdc9db090c2811885e020a5898e1841af861f85f800182659594095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba09d7b7423aa187cf696e6b7ebea70f0bc3e3373a7b9494f662fe6050dd6bba82da016dc9e01d65fcba0460d3ad3ee26b2aca2ae6958fb747b0a68f447476e3a1dd5c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -611,7 +604,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ffe1435521fde24b7bdf5b873bbfdaf2db33a9df4f39e3a0021fdebdab0c1612a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3684310742858fdb2f161afa2340e351cf6c118e86e014262accc21e79319031",
+        "lastblockhash" : "0xf38360409f4d6faa1d0bfdc0fb73e473e959c383f25fc55ec024a442d9af4f8d",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_TxToSuicideOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_TxToSuicideOOG_d0g0v0.json
index 6aa39e9cc..cd70ebe6d 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_TxToSuicideOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_TxToSuicideOOG_d0g0v0.json
@@ -2,7 +2,7 @@
     "refund_TxToSuicideOOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicideOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x520a",
-                    "hash" : "0x33bd5a59d85238228d088d7e73153e5e0bd140fb2bf1b563c204b0653ec9a409",
-                    "mixHash" : "0x065af08ae779846dfe39c4c80518b64a4fcf69e3710510a79d449374cf6bfd7c",
-                    "nonce" : "0x664e201ab4b4c0af",
+                    "hash" : "0x2e77ea82220def6d63e705bda97539a10c6bfed039f2b18b1081052898d62420",
+                    "mixHash" : "0x63668c38a79da39e77a5baa5f2384000e43dedf8dc27ebc4ad4dfd3459d35a8d",
+                    "nonce" : "0x40c1c70d7cfd671a",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
                     "receiptTrie" : "0x2f80f76d88921985d5457a0dde2cf5102df4037660f8902f3fa43762ea476d71",
-                    "stateRoot" : "0xa81a0eba8d9191115c774db2c83435fc5d01b5405bfd77adcf1b309684dce3f2",
+                    "stateRoot" : "0x3bad07ef6dd3eba883a2ec7f9d7a4ebcfc67bd691cb0728647ac6e841a1bba8c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ad",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a81a0eba8d9191115c774db2c83435fc5d01b5405bfd77adcf1b309684dce3f2a07210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ada02f80f76d88921985d5457a0dde2cf5102df4037660f8902f3fa43762ea476d71b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520a8203e880a0065af08ae779846dfe39c4c80518b64a4fcf69e3710510a79d449374cf6bfd7c88664e201ab4b4c0aff861f85f800182520a94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca09c647c65c10f9a3f2e16878a25405b22f2fef2ec96b18d68f68d34d551b93de4a023267f7401ef09f9615de4bbb3943cb2be892bc889efff06f16fddf59ac3ac91c0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03bad07ef6dd3eba883a2ec7f9d7a4ebcfc67bd691cb0728647ac6e841a1bba8ca07210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ada02f80f76d88921985d5457a0dde2cf5102df4037660f8902f3fa43762ea476d71b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520a8203e880a063668c38a79da39e77a5baa5f2384000e43dedf8dc27ebc4ad4dfd3459d35a8d8840c1c70d7cfd671af861f85f800182520a94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca09c647c65c10f9a3f2e16878a25405b22f2fef2ec96b18d68f68d34d551b93de4a023267f7401ef09f9615de4bbb3943cb2be892bc889efff06f16fddf59ac3ac91c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,18 +62,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x33bd5a59d85238228d088d7e73153e5e0bd140fb2bf1b563c204b0653ec9a409",
+        "lastblockhash" : "0x2e77ea82220def6d63e705bda97539a10c6bfed039f2b18b1081052898d62420",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4520a",
+                "balance" : "0x29a2241af62c520a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -116,7 +109,7 @@
     "refund_TxToSuicideOOG_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicideOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +121,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x520a",
-                    "hash" : "0xe111f4432795d3b214491d3e0767fb06c72245406cad3ac1b03e11492d3b5881",
-                    "mixHash" : "0xbda974e72affef3a19dd6ccdf1f8d1119985cf99e2fd243ac130a2bacdbece6a",
-                    "nonce" : "0xc25563bfa8def9dd",
+                    "hash" : "0x3d6297c19f70f3ab30614bd4220bd58923a3875e08628bdd821210af50246cce",
+                    "mixHash" : "0x3f77217ab8fb0950cafa05a1584949563f82e5eca4915ce00a1ea5ddd585429f",
+                    "nonce" : "0x8c17fbd4616e7f15",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
                     "receiptTrie" : "0x2f80f76d88921985d5457a0dde2cf5102df4037660f8902f3fa43762ea476d71",
-                    "stateRoot" : "0xa81a0eba8d9191115c774db2c83435fc5d01b5405bfd77adcf1b309684dce3f2",
+                    "stateRoot" : "0xa393635b054fe3560bbae237680505afedc320185c4fb85f9ba09c21951a6175",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x7210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ad",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a81a0eba8d9191115c774db2c83435fc5d01b5405bfd77adcf1b309684dce3f2a07210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ada02f80f76d88921985d5457a0dde2cf5102df4037660f8902f3fa43762ea476d71b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520a8203e880a0bda974e72affef3a19dd6ccdf1f8d1119985cf99e2fd243ac130a2bacdbece6a88c25563bfa8def9ddf861f85f800182520a94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca09c647c65c10f9a3f2e16878a25405b22f2fef2ec96b18d68f68d34d551b93de4a023267f7401ef09f9615de4bbb3943cb2be892bc889efff06f16fddf59ac3ac91c0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a393635b054fe3560bbae237680505afedc320185c4fb85f9ba09c21951a6175a07210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ada02f80f76d88921985d5457a0dde2cf5102df4037660f8902f3fa43762ea476d71b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520a8203e880a03f77217ab8fb0950cafa05a1584949563f82e5eca4915ce00a1ea5ddd585429f888c17fbd4616e7f15f861f85f800182520a94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca09c647c65c10f9a3f2e16878a25405b22f2fef2ec96b18d68f68d34d551b93de4a023267f7401ef09f9615de4bbb3943cb2be892bc889efff06f16fddf59ac3ac91c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,7 +169,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe111f4432795d3b214491d3e0767fb06c72245406cad3ac1b03e11492d3b5881",
+        "lastblockhash" : "0x3d6297c19f70f3ab30614bd4220bd58923a3875e08628bdd821210af50246cce",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -187,7 +180,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4520a",
+                "balance" : "0x29a2241af62c520a",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -230,7 +223,7 @@
     "refund_TxToSuicideOOG_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicideOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -242,9 +235,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x520a",
-                    "hash" : "0x2aa3ba7140fa643b8bbdc8ec6ac892212d9a5a3b682828e24b094d9aececeb29",
-                    "mixHash" : "0x08b5f27ce690ac0ef107367f16650a9ec973c84d85c165f23d74282bcd32aaa2",
-                    "nonce" : "0xa4dccb3d73c4b69a",
+                    "hash" : "0x872edd554b16a900d74ecef405aa5d6221e03abeea04aa9a548e7b206fcc432f",
+                    "mixHash" : "0xb0769e0d5ac9cdb5539508c3045e33b64784d562c059190295a73a023ccfdf7f",
+                    "nonce" : "0x56675a8a723ad602",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
                     "receiptTrie" : "0xc71a9383ba1469c8a2321240f0545ea619c63421a4e172d9e84cebed53d02ad8",
@@ -253,7 +246,7 @@
                     "transactionsTrie" : "0x7210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ad",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0594f337d177670cf497c9868e65681f934faa6b8a165cc779829dfd77cc60b07a07210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ada0c71a9383ba1469c8a2321240f0545ea619c63421a4e172d9e84cebed53d02ad8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520a8203e880a008b5f27ce690ac0ef107367f16650a9ec973c84d85c165f23d74282bcd32aaa288a4dccb3d73c4b69af861f85f800182520a94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca09c647c65c10f9a3f2e16878a25405b22f2fef2ec96b18d68f68d34d551b93de4a023267f7401ef09f9615de4bbb3943cb2be892bc889efff06f16fddf59ac3ac91c0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0594f337d177670cf497c9868e65681f934faa6b8a165cc779829dfd77cc60b07a07210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ada0c71a9383ba1469c8a2321240f0545ea619c63421a4e172d9e84cebed53d02ad8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520a8203e880a0b0769e0d5ac9cdb5539508c3045e33b64784d562c059190295a73a023ccfdf7f8856675a8a723ad602f861f85f800182520a94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca09c647c65c10f9a3f2e16878a25405b22f2fef2ec96b18d68f68d34d551b93de4a023267f7401ef09f9615de4bbb3943cb2be892bc889efff06f16fddf59ac3ac91c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -290,7 +283,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2aa3ba7140fa643b8bbdc8ec6ac892212d9a5a3b682828e24b094d9aececeb29",
+        "lastblockhash" : "0x872edd554b16a900d74ecef405aa5d6221e03abeea04aa9a548e7b206fcc432f",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -337,7 +330,7 @@
     "refund_TxToSuicideOOG_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicideOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -349,9 +342,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x520a",
-                    "hash" : "0xef59e39f9b4a88935cc9185c0438e18f03edae91957b7567456b5ff99dc29193",
-                    "mixHash" : "0xd3e47e147b4a32e0910a0ac1e5d5da72122cd0e5775258aa188c70c114b9a52b",
-                    "nonce" : "0x50af2e53b16cbdf4",
+                    "hash" : "0x9bd8448c4bda64264c8aadbe1b06650f3d7cf2e2cdead77ffa18e94f89b54a1e",
+                    "mixHash" : "0x3477f63f6edd0c2e5e521c06164f8c5138e464ea5062b99091cb08cd1636a8ce",
+                    "nonce" : "0x19ff0999e69eca71",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
                     "receiptTrie" : "0xc71a9383ba1469c8a2321240f0545ea619c63421a4e172d9e84cebed53d02ad8",
@@ -360,7 +353,7 @@
                     "transactionsTrie" : "0x7210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ad",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0594f337d177670cf497c9868e65681f934faa6b8a165cc779829dfd77cc60b07a07210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ada0c71a9383ba1469c8a2321240f0545ea619c63421a4e172d9e84cebed53d02ad8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520a8203e880a0d3e47e147b4a32e0910a0ac1e5d5da72122cd0e5775258aa188c70c114b9a52b8850af2e53b16cbdf4f861f85f800182520a94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca09c647c65c10f9a3f2e16878a25405b22f2fef2ec96b18d68f68d34d551b93de4a023267f7401ef09f9615de4bbb3943cb2be892bc889efff06f16fddf59ac3ac91c0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0594f337d177670cf497c9868e65681f934faa6b8a165cc779829dfd77cc60b07a07210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ada0c71a9383ba1469c8a2321240f0545ea619c63421a4e172d9e84cebed53d02ad8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520a8203e880a03477f63f6edd0c2e5e521c06164f8c5138e464ea5062b99091cb08cd1636a8ce8819ff0999e69eca71f861f85f800182520a94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca09c647c65c10f9a3f2e16878a25405b22f2fef2ec96b18d68f68d34d551b93de4a023267f7401ef09f9615de4bbb3943cb2be892bc889efff06f16fddf59ac3ac91c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -397,7 +390,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xef59e39f9b4a88935cc9185c0438e18f03edae91957b7567456b5ff99dc29193",
+        "lastblockhash" : "0x9bd8448c4bda64264c8aadbe1b06650f3d7cf2e2cdead77ffa18e94f89b54a1e",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -444,7 +437,7 @@
     "refund_TxToSuicideOOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicideOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -456,9 +449,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x520a",
-                    "hash" : "0xe7779dfd58c35d37ac88b553a44b103257ea121f4fc964fb9426b846edf8aa02",
-                    "mixHash" : "0x8ce2bd1e651c20a94a6ef061a88b83a010d674ecc3a4f06aee8b6592f2b961f1",
-                    "nonce" : "0x909d04e252cf2656",
+                    "hash" : "0xa1cc1dc06b4c3bf67d9a8900ad64c2ace16fcce465aee01e9b75ce87806e2e61",
+                    "mixHash" : "0xf7db62001be4f5b94cfd803743433ae36869b5ced415e8fd3aaaf81c87e9052c",
+                    "nonce" : "0xa44e609fa4c6d5a1",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
                     "receiptTrie" : "0xc71a9383ba1469c8a2321240f0545ea619c63421a4e172d9e84cebed53d02ad8",
@@ -467,7 +460,7 @@
                     "transactionsTrie" : "0x7210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ad",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0594f337d177670cf497c9868e65681f934faa6b8a165cc779829dfd77cc60b07a07210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ada0c71a9383ba1469c8a2321240f0545ea619c63421a4e172d9e84cebed53d02ad8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520a8203e880a08ce2bd1e651c20a94a6ef061a88b83a010d674ecc3a4f06aee8b6592f2b961f188909d04e252cf2656f861f85f800182520a94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca09c647c65c10f9a3f2e16878a25405b22f2fef2ec96b18d68f68d34d551b93de4a023267f7401ef09f9615de4bbb3943cb2be892bc889efff06f16fddf59ac3ac91c0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0594f337d177670cf497c9868e65681f934faa6b8a165cc779829dfd77cc60b07a07210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ada0c71a9383ba1469c8a2321240f0545ea619c63421a4e172d9e84cebed53d02ad8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520a8203e880a0f7db62001be4f5b94cfd803743433ae36869b5ced415e8fd3aaaf81c87e9052c88a44e609fa4c6d5a1f861f85f800182520a94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca09c647c65c10f9a3f2e16878a25405b22f2fef2ec96b18d68f68d34d551b93de4a023267f7401ef09f9615de4bbb3943cb2be892bc889efff06f16fddf59ac3ac91c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -504,7 +497,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe7779dfd58c35d37ac88b553a44b103257ea121f4fc964fb9426b846edf8aa02",
+        "lastblockhash" : "0xa1cc1dc06b4c3bf67d9a8900ad64c2ace16fcce465aee01e9b75ce87806e2e61",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -551,7 +544,7 @@
     "refund_TxToSuicideOOG_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicideOOG_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -563,9 +556,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x520a",
-                    "hash" : "0x9dff1ca01cc198b20dca227ab0dc9b69376809012b93905e8454f46e3a1a2431",
-                    "mixHash" : "0xdf9b5c00f47acb06a472fcc3f94542c1d1082e7719dae3806409a1a078de8725",
-                    "nonce" : "0xa21183707e5d1cce",
+                    "hash" : "0xdb31ec36595f8f1205f12289565dc53287a50703d1e8438e893084b6e3608dd0",
+                    "mixHash" : "0x4cc26ef41953f0851b3d1782a0fdcb3745331ec35a9aa9aa8b13c77efbf435dc",
+                    "nonce" : "0x909cbb43bca1dcfd",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
                     "receiptTrie" : "0xc71a9383ba1469c8a2321240f0545ea619c63421a4e172d9e84cebed53d02ad8",
@@ -574,7 +567,7 @@
                     "transactionsTrie" : "0x7210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ad",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0594f337d177670cf497c9868e65681f934faa6b8a165cc779829dfd77cc60b07a07210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ada0c71a9383ba1469c8a2321240f0545ea619c63421a4e172d9e84cebed53d02ad8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520a8203e880a0df9b5c00f47acb06a472fcc3f94542c1d1082e7719dae3806409a1a078de872588a21183707e5d1ccef861f85f800182520a94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca09c647c65c10f9a3f2e16878a25405b22f2fef2ec96b18d68f68d34d551b93de4a023267f7401ef09f9615de4bbb3943cb2be892bc889efff06f16fddf59ac3ac91c0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0594f337d177670cf497c9868e65681f934faa6b8a165cc779829dfd77cc60b07a07210e5b1e98318cc777a06b9f3c8d639ff872ee48490861aeee6f9ea0875f0ada0c71a9383ba1469c8a2321240f0545ea619c63421a4e172d9e84cebed53d02ad8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520a8203e880a04cc26ef41953f0851b3d1782a0fdcb3745331ec35a9aa9aa8b13c77efbf435dc88909cbb43bca1dcfdf861f85f800182520a94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca09c647c65c10f9a3f2e16878a25405b22f2fef2ec96b18d68f68d34d551b93de4a023267f7401ef09f9615de4bbb3943cb2be892bc889efff06f16fddf59ac3ac91c0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -611,7 +604,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9dff1ca01cc198b20dca227ab0dc9b69376809012b93905e8454f46e3a1a2431",
+        "lastblockhash" : "0xdb31ec36595f8f1205f12289565dc53287a50703d1e8438e893084b6e3608dd0",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_TxToSuicide_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_TxToSuicide_d0g0v0.json
index 12bb800a3..5976e6162 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_TxToSuicide_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_TxToSuicide_d0g0v0.json
@@ -2,7 +2,7 @@
     "refund_TxToSuicide_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x520b",
-                    "hash" : "0x471a01d48fbec845c1e52c8fe599edf8a2209ac72a3a934d3416e7c2470ad86e",
-                    "mixHash" : "0xe9344117cb89e06b4ab75132ae38206d2c34462b0c6ee469523d8e55b18a78f0",
-                    "nonce" : "0xb00c82991b92f7a6",
+                    "hash" : "0x26d76c17309823ccbbec10c43e67ea56af9967a94309fe2ab0e444bf5805e725",
+                    "mixHash" : "0x41e384bf23117fbeb9207ab2fe40f629c5fcdb3207a876d7e0c5582d2eb3c537",
+                    "nonce" : "0xef79c95a7744c577",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
                     "receiptTrie" : "0x4053cc5113c9796c3227d96da76ad74cec79e4d5110003e92638ddb3772355e5",
-                    "stateRoot" : "0x928f8ffc8d6f3441f311dd19504033ad5d7bd612257b3f3ad6436c5a7bc879b7",
+                    "stateRoot" : "0xe8242202a1cb1cc680e34190fbb6ce648afb771ffe162978b0038267ec41853c",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0928f8ffc8d6f3441f311dd19504033ad5d7bd612257b3f3ad6436c5a7bc879b7a0665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489a04053cc5113c9796c3227d96da76ad74cec79e4d5110003e92638ddb3772355e5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520b8203e880a0e9344117cb89e06b4ab75132ae38206d2c34462b0c6ee469523d8e55b18a78f088b00c82991b92f7a6f861f85f800182520b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca0b736349ed314af23244e16cb7e723d2e19483d98f1e913116e1288efd821e39ca03d84cb7e6409a0baeeeded8cd4f6b234bc9afc71433dbac75f72badd2b0c11adc0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e8242202a1cb1cc680e34190fbb6ce648afb771ffe162978b0038267ec41853ca0665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489a04053cc5113c9796c3227d96da76ad74cec79e4d5110003e92638ddb3772355e5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520b8203e880a041e384bf23117fbeb9207ab2fe40f629c5fcdb3207a876d7e0c5582d2eb3c53788ef79c95a7744c577f861f85f800182520b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca0b736349ed314af23244e16cb7e723d2e19483d98f1e913116e1288efd821e39ca03d84cb7e6409a0baeeeded8cd4f6b234bc9afc71433dbac75f72badd2b0c11adc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,18 +62,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x471a01d48fbec845c1e52c8fe599edf8a2209ac72a3a934d3416e7c2470ad86e",
+        "lastblockhash" : "0x26d76c17309823ccbbec10c43e67ea56af9967a94309fe2ab0e444bf5805e725",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4520b",
+                "balance" : "0x29a2241af62c520b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -116,7 +109,7 @@
     "refund_TxToSuicide_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +121,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x520b",
-                    "hash" : "0x61643c0042b750144cf237a8b94dd8d529a06f9be575e073aff3e0deabf223dd",
-                    "mixHash" : "0x76e3f6cdbd9b3019b794cf35de60e7ae82d25593acd3046d76c5623a560b7e90",
-                    "nonce" : "0x22a887a588a65a88",
+                    "hash" : "0x54081f2c43bab5e3261744504f98d7d162644d8e1b599f6d906e30847fb9e682",
+                    "mixHash" : "0x1cd025a4a9d05195e2e3fd0755446c24b90e88310c68ec039d029511e94361c9",
+                    "nonce" : "0x7bdedfb73c0aaa7b",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
                     "receiptTrie" : "0x4053cc5113c9796c3227d96da76ad74cec79e4d5110003e92638ddb3772355e5",
-                    "stateRoot" : "0x928f8ffc8d6f3441f311dd19504033ad5d7bd612257b3f3ad6436c5a7bc879b7",
+                    "stateRoot" : "0xc4076587190d92d3d7086cf92240a042fedef05ab37207a76bbaf7285652c934",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0928f8ffc8d6f3441f311dd19504033ad5d7bd612257b3f3ad6436c5a7bc879b7a0665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489a04053cc5113c9796c3227d96da76ad74cec79e4d5110003e92638ddb3772355e5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520b8203e880a076e3f6cdbd9b3019b794cf35de60e7ae82d25593acd3046d76c5623a560b7e908822a887a588a65a88f861f85f800182520b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca0b736349ed314af23244e16cb7e723d2e19483d98f1e913116e1288efd821e39ca03d84cb7e6409a0baeeeded8cd4f6b234bc9afc71433dbac75f72badd2b0c11adc0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c4076587190d92d3d7086cf92240a042fedef05ab37207a76bbaf7285652c934a0665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489a04053cc5113c9796c3227d96da76ad74cec79e4d5110003e92638ddb3772355e5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520b8203e880a01cd025a4a9d05195e2e3fd0755446c24b90e88310c68ec039d029511e94361c9887bdedfb73c0aaa7bf861f85f800182520b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca0b736349ed314af23244e16cb7e723d2e19483d98f1e913116e1288efd821e39ca03d84cb7e6409a0baeeeded8cd4f6b234bc9afc71433dbac75f72badd2b0c11adc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,7 +169,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x61643c0042b750144cf237a8b94dd8d529a06f9be575e073aff3e0deabf223dd",
+        "lastblockhash" : "0x54081f2c43bab5e3261744504f98d7d162644d8e1b599f6d906e30847fb9e682",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -187,7 +180,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4520b",
+                "balance" : "0x29a2241af62c520b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -230,7 +223,7 @@
     "refund_TxToSuicide_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -242,9 +235,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x520b",
-                    "hash" : "0xfd78c915d8f99ca0b0904901ef933b10c063081bc60684ff3624027429d84bad",
-                    "mixHash" : "0xe29e558be17234e9b6c32b4a508c25966d2661930ff1ff18addf2236eb277184",
-                    "nonce" : "0xdb4eb27174b0980e",
+                    "hash" : "0xece73150da0fd62a542a27141f91ed12275ae1fe95cd1ebf42a42095ce391845",
+                    "mixHash" : "0xc77ef3c075015d23784fb3f444e62cd8a791cb6ea04de9cb61e7d0b113289b99",
+                    "nonce" : "0x89e6c61d383b3508",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
                     "receiptTrie" : "0x5e18d0570df18249230e15bd83dcc239f64621b742fd74860557fe87407378a4",
@@ -253,7 +246,7 @@
                     "transactionsTrie" : "0x665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0715c5bebc59ddc652a16bde8d7a8e8c08278fda903637ef1b8f0d6a0aad8e751a0665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489a05e18d0570df18249230e15bd83dcc239f64621b742fd74860557fe87407378a4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520b8203e880a0e29e558be17234e9b6c32b4a508c25966d2661930ff1ff18addf2236eb27718488db4eb27174b0980ef861f85f800182520b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca0b736349ed314af23244e16cb7e723d2e19483d98f1e913116e1288efd821e39ca03d84cb7e6409a0baeeeded8cd4f6b234bc9afc71433dbac75f72badd2b0c11adc0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0715c5bebc59ddc652a16bde8d7a8e8c08278fda903637ef1b8f0d6a0aad8e751a0665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489a05e18d0570df18249230e15bd83dcc239f64621b742fd74860557fe87407378a4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520b8203e880a0c77ef3c075015d23784fb3f444e62cd8a791cb6ea04de9cb61e7d0b113289b998889e6c61d383b3508f861f85f800182520b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca0b736349ed314af23244e16cb7e723d2e19483d98f1e913116e1288efd821e39ca03d84cb7e6409a0baeeeded8cd4f6b234bc9afc71433dbac75f72badd2b0c11adc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -290,7 +283,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfd78c915d8f99ca0b0904901ef933b10c063081bc60684ff3624027429d84bad",
+        "lastblockhash" : "0xece73150da0fd62a542a27141f91ed12275ae1fe95cd1ebf42a42095ce391845",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -337,7 +330,7 @@
     "refund_TxToSuicide_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -349,9 +342,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x520b",
-                    "hash" : "0xffc844899c88b8df0fb84a0afb2f1754ef03fd11e29868b22b6dd809cc5e1868",
-                    "mixHash" : "0x8a33fdb43640249f445adc95c24769ae4ac64cf3b4aa86ff197c2413bcb8221f",
-                    "nonce" : "0x5d3596b9f8709a20",
+                    "hash" : "0xc55335edf2ecff9c9c4c372c47516d60f70f4a94b008b4e0dfadd6f1d3570a06",
+                    "mixHash" : "0xf210d4b7c1f5f3d8ea490163e4e154a68726ca777094cbf767219611584ac00d",
+                    "nonce" : "0x3eab79513dcf88db",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
                     "receiptTrie" : "0x5e18d0570df18249230e15bd83dcc239f64621b742fd74860557fe87407378a4",
@@ -360,7 +353,7 @@
                     "transactionsTrie" : "0x665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0715c5bebc59ddc652a16bde8d7a8e8c08278fda903637ef1b8f0d6a0aad8e751a0665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489a05e18d0570df18249230e15bd83dcc239f64621b742fd74860557fe87407378a4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520b8203e880a08a33fdb43640249f445adc95c24769ae4ac64cf3b4aa86ff197c2413bcb8221f885d3596b9f8709a20f861f85f800182520b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca0b736349ed314af23244e16cb7e723d2e19483d98f1e913116e1288efd821e39ca03d84cb7e6409a0baeeeded8cd4f6b234bc9afc71433dbac75f72badd2b0c11adc0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0715c5bebc59ddc652a16bde8d7a8e8c08278fda903637ef1b8f0d6a0aad8e751a0665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489a05e18d0570df18249230e15bd83dcc239f64621b742fd74860557fe87407378a4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082520b8203e880a0f210d4b7c1f5f3d8ea490163e4e154a68726ca777094cbf767219611584ac00d883eab79513dcf88dbf861f85f800182520b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca0b736349ed314af23244e16cb7e723d2e19483d98f1e913116e1288efd821e39ca03d84cb7e6409a0baeeeded8cd4f6b234bc9afc71433dbac75f72badd2b0c11adc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -397,7 +390,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xffc844899c88b8df0fb84a0afb2f1754ef03fd11e29868b22b6dd809cc5e1868",
+        "lastblockhash" : "0xc55335edf2ecff9c9c4c372c47516d60f70f4a94b008b4e0dfadd6f1d3570a06",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -444,7 +437,7 @@
     "refund_TxToSuicide_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -456,9 +449,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x2906",
-                    "hash" : "0x7ffc3f5802df489cf9392ea20a48f5a5cae03b0f425fca5cd4d88bf5ed555213",
-                    "mixHash" : "0xc597556bebb0614aba2c4a095e270190a6a140a1c7082a6829b903c5fa57e6ab",
-                    "nonce" : "0x21581f3c8f2643cc",
+                    "hash" : "0xacfd04dded2286175ade9242b1b6a9701415e3e3144bb99dadf20c6bce547de6",
+                    "mixHash" : "0x245cffc41801eedb17d7bab768d243e371d33230f987988d90c5434116b40c59",
+                    "nonce" : "0x8389ae44baa713ae",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
                     "receiptTrie" : "0xd4b15c293435a5d48086c5f74c34acb137fdd345d11d1210adaa4f280e1860f4",
@@ -467,7 +460,7 @@
                     "transactionsTrie" : "0x665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a48a28ef51d1648c351cc529b9da76a9c8d740c7973d169d24c24c199cbb83ea0665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489a0d4b15c293435a5d48086c5f74c34acb137fdd345d11d1210adaa4f280e1860f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a0c597556bebb0614aba2c4a095e270190a6a140a1c7082a6829b903c5fa57e6ab8821581f3c8f2643ccf861f85f800182520b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca0b736349ed314af23244e16cb7e723d2e19483d98f1e913116e1288efd821e39ca03d84cb7e6409a0baeeeded8cd4f6b234bc9afc71433dbac75f72badd2b0c11adc0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a48a28ef51d1648c351cc529b9da76a9c8d740c7973d169d24c24c199cbb83ea0665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489a0d4b15c293435a5d48086c5f74c34acb137fdd345d11d1210adaa4f280e1860f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a0245cffc41801eedb17d7bab768d243e371d33230f987988d90c5434116b40c59888389ae44baa713aef861f85f800182520b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca0b736349ed314af23244e16cb7e723d2e19483d98f1e913116e1288efd821e39ca03d84cb7e6409a0baeeeded8cd4f6b234bc9afc71433dbac75f72badd2b0c11adc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -504,7 +497,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7ffc3f5802df489cf9392ea20a48f5a5cae03b0f425fca5cd4d88bf5ed555213",
+        "lastblockhash" : "0xacfd04dded2286175ade9242b1b6a9701415e3e3144bb99dadf20c6bce547de6",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -550,7 +543,7 @@
     "refund_TxToSuicide_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -562,9 +555,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x2906",
-                    "hash" : "0xf0784b8b1f9707ff96ef9f687853fd3d5d41289aee05f7755664fd9ae7a97ae7",
-                    "mixHash" : "0xf03133235793eb6a20ee67594a47d5da2d3221252655fe5499569348cb693d25",
-                    "nonce" : "0xde12484100e6a0ac",
+                    "hash" : "0x57cd1825f2bd6e3ae9f4179a8e8ebfa2b9dc46ee21b4d01743e3fde79dbbff3e",
+                    "mixHash" : "0x4f50bda2e48ee98498b9316eb841a38b3242b90d013fc3406f1d9f7bfc730c26",
+                    "nonce" : "0xff44eaaec0ee421b",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
                     "receiptTrie" : "0xd4b15c293435a5d48086c5f74c34acb137fdd345d11d1210adaa4f280e1860f4",
@@ -573,7 +566,7 @@
                     "transactionsTrie" : "0x665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a48a28ef51d1648c351cc529b9da76a9c8d740c7973d169d24c24c199cbb83ea0665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489a0d4b15c293435a5d48086c5f74c34acb137fdd345d11d1210adaa4f280e1860f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a0f03133235793eb6a20ee67594a47d5da2d3221252655fe5499569348cb693d2588de12484100e6a0acf861f85f800182520b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca0b736349ed314af23244e16cb7e723d2e19483d98f1e913116e1288efd821e39ca03d84cb7e6409a0baeeeded8cd4f6b234bc9afc71433dbac75f72badd2b0c11adc0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a48a28ef51d1648c351cc529b9da76a9c8d740c7973d169d24c24c199cbb83ea0665e16be46878b7ae8f5670147e127d6086d9915db7c6cb1db869d8ae876b489a0d4b15c293435a5d48086c5f74c34acb137fdd345d11d1210adaa4f280e1860f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a04f50bda2e48ee98498b9316eb841a38b3242b90d013fc3406f1d9f7bfc730c2688ff44eaaec0ee421bf861f85f800182520b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca0b736349ed314af23244e16cb7e723d2e19483d98f1e913116e1288efd821e39ca03d84cb7e6409a0baeeeded8cd4f6b234bc9afc71433dbac75f72badd2b0c11adc0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -610,7 +603,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf0784b8b1f9707ff96ef9f687853fd3d5d41289aee05f7755664fd9ae7a97ae7",
+        "lastblockhash" : "0x57cd1825f2bd6e3ae9f4179a8e8ebfa2b9dc46ee21b4d01743e3fde79dbbff3e",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_TxToSuicide_d0g1v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_TxToSuicide_d0g1v0.json
index 044fa24bc..e311a31f7 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_TxToSuicide_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_TxToSuicide_d0g1v0.json
@@ -2,7 +2,7 @@
     "refund_TxToSuicide_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicide_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x697b",
-                    "hash" : "0xd90acb2c6ad4733fe68f42f1d89e447b12895a8eb6fd24ee587b03d1b8c5acfe",
-                    "mixHash" : "0x076eebc385c25b7d493d6184171d428f5fa81df95cabdd5ecfd7cf792ecafc2d",
-                    "nonce" : "0x0cea8f2d25677157",
+                    "hash" : "0xf4737e199a86a01433d267d8d3f491dc1b105c939cf61c0dbb24f312e20af135",
+                    "mixHash" : "0x2269cd5f26ea68b63ba2a979f35acc2eb9283a507590e312534e2fcaa5893fba",
+                    "nonce" : "0xe2ef9825396cdbe2",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
                     "receiptTrie" : "0x11b9a3af527495821ab161c2237f35f6a032d0dc5e9ee404f60ba12f9b7c26a9",
-                    "stateRoot" : "0x75afa0794e3fdc8c14173fb792e67c2eee87c11a9491d075acac0180c0a28079",
+                    "stateRoot" : "0x3aa1c347adb6998809ad967783c2b6bd51e1824f92cb9d92132efa4799d0f035",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa075afa0794e3fdc8c14173fb792e67c2eee87c11a9491d075acac0180c0a28079a0421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57a011b9a3af527495821ab161c2237f35f6a032d0dc5e9ee404f60ba12f9b7c26a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082697b8203e880a0076eebc385c25b7d493d6184171d428f5fa81df95cabdd5ecfd7cf792ecafc2d880cea8f2d25677157f861f85f800182ee4b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca070c4db9cd6e4f9991da63856665e47883e1253183e0c507012018e3f5aaecfdba02f2cf7c5954a2fa03ec7ee2bc6cfd72565016707e21326c3d3999f2447d553cec0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03aa1c347adb6998809ad967783c2b6bd51e1824f92cb9d92132efa4799d0f035a0421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57a011b9a3af527495821ab161c2237f35f6a032d0dc5e9ee404f60ba12f9b7c26a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082697b8203e880a02269cd5f26ea68b63ba2a979f35acc2eb9283a507590e312534e2fcaa5893fba88e2ef9825396cdbe2f861f85f800182ee4b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca070c4db9cd6e4f9991da63856665e47883e1253183e0c507012018e3f5aaecfdba02f2cf7c5954a2fa03ec7ee2bc6cfd72565016707e21326c3d3999f2447d553cec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd90acb2c6ad4733fe68f42f1d89e447b12895a8eb6fd24ee587b03d1b8c5acfe",
+        "lastblockhash" : "0xf4737e199a86a01433d267d8d3f491dc1b105c939cf61c0dbb24f312e20af135",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "",
@@ -80,7 +73,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4697b",
+                "balance" : "0x29a2241af62c697b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -115,7 +108,7 @@
     "refund_TxToSuicide_d0g1v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicide_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -127,18 +120,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x697b",
-                    "hash" : "0x878c3a199cc3b1d2ac717ecb5cb392e8468c2397ca379fcb7ad462f45fc0d8c5",
-                    "mixHash" : "0xb6fc74032838e061f30af635f3b3c79e99bc5f99732ef2ebe4e063e22afa4b42",
-                    "nonce" : "0x2fda1ac74977da98",
+                    "hash" : "0x2cf1c98c98db86a3a0c65069a1765c4cde79b910e83b2678d3b8ff6bfbef5262",
+                    "mixHash" : "0xfe55cc519b1edadf88a779c0873638cedd4a09555f021c0ff544f1439dfe0320",
+                    "nonce" : "0x3873fb747b6d1e5f",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
                     "receiptTrie" : "0x11b9a3af527495821ab161c2237f35f6a032d0dc5e9ee404f60ba12f9b7c26a9",
-                    "stateRoot" : "0x75afa0794e3fdc8c14173fb792e67c2eee87c11a9491d075acac0180c0a28079",
+                    "stateRoot" : "0x463c26996a52c7ecdeebb786516e96ba1ff95fa77a01b00e35361e2cd6ed93df",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa075afa0794e3fdc8c14173fb792e67c2eee87c11a9491d075acac0180c0a28079a0421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57a011b9a3af527495821ab161c2237f35f6a032d0dc5e9ee404f60ba12f9b7c26a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082697b8203e880a0b6fc74032838e061f30af635f3b3c79e99bc5f99732ef2ebe4e063e22afa4b42882fda1ac74977da98f861f85f800182ee4b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca070c4db9cd6e4f9991da63856665e47883e1253183e0c507012018e3f5aaecfdba02f2cf7c5954a2fa03ec7ee2bc6cfd72565016707e21326c3d3999f2447d553cec0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0463c26996a52c7ecdeebb786516e96ba1ff95fa77a01b00e35361e2cd6ed93dfa0421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57a011b9a3af527495821ab161c2237f35f6a032d0dc5e9ee404f60ba12f9b7c26a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082697b8203e880a0fe55cc519b1edadf88a779c0873638cedd4a09555f021c0ff544f1439dfe0320883873fb747b6d1e5ff861f85f800182ee4b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca070c4db9cd6e4f9991da63856665e47883e1253183e0c507012018e3f5aaecfdba02f2cf7c5954a2fa03ec7ee2bc6cfd72565016707e21326c3d3999f2447d553cec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -175,7 +168,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x878c3a199cc3b1d2ac717ecb5cb392e8468c2397ca379fcb7ad462f45fc0d8c5",
+        "lastblockhash" : "0x2cf1c98c98db86a3a0c65069a1765c4cde79b910e83b2678d3b8ff6bfbef5262",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -193,7 +186,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4697b",
+                "balance" : "0x29a2241af62c697b",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -228,7 +221,7 @@
     "refund_TxToSuicide_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicide_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -240,9 +233,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x697b",
-                    "hash" : "0xc931b4b692b325bc796dcd9159d2ce246b5b03dc9a8a39702e500f011887efab",
-                    "mixHash" : "0x266fcbfdebc7f2a763fba44089351a0b3cabc816c6b85f509acc3b652ac335db",
-                    "nonce" : "0xe472f77d4011f9a5",
+                    "hash" : "0x6358ae251b622c15d494fbc5997a1d1612ae0a9ac2c2b00ff080551adf64d13f",
+                    "mixHash" : "0x4cc65cbacba13bd3739a3fa69312138ca9c7f4c8325a294856e17f62e89bd23e",
+                    "nonce" : "0x3f1339d9969d1146",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
                     "receiptTrie" : "0x40bbf23bd4e483252b521ebcec3acf13024b955e91bc8523a0521b9337be8818",
@@ -251,7 +244,7 @@
                     "transactionsTrie" : "0x421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0762ed63d500f197bd382a95e6359ccfb3fc4bba6f104ef417facd5f85eb3544da0421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57a040bbf23bd4e483252b521ebcec3acf13024b955e91bc8523a0521b9337be8818b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082697b8203e880a0266fcbfdebc7f2a763fba44089351a0b3cabc816c6b85f509acc3b652ac335db88e472f77d4011f9a5f861f85f800182ee4b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca070c4db9cd6e4f9991da63856665e47883e1253183e0c507012018e3f5aaecfdba02f2cf7c5954a2fa03ec7ee2bc6cfd72565016707e21326c3d3999f2447d553cec0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0762ed63d500f197bd382a95e6359ccfb3fc4bba6f104ef417facd5f85eb3544da0421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57a040bbf23bd4e483252b521ebcec3acf13024b955e91bc8523a0521b9337be8818b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082697b8203e880a04cc65cbacba13bd3739a3fa69312138ca9c7f4c8325a294856e17f62e89bd23e883f1339d9969d1146f861f85f800182ee4b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca070c4db9cd6e4f9991da63856665e47883e1253183e0c507012018e3f5aaecfdba02f2cf7c5954a2fa03ec7ee2bc6cfd72565016707e21326c3d3999f2447d553cec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -288,7 +281,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc931b4b692b325bc796dcd9159d2ce246b5b03dc9a8a39702e500f011887efab",
+        "lastblockhash" : "0x6358ae251b622c15d494fbc5997a1d1612ae0a9ac2c2b00ff080551adf64d13f",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -334,7 +327,7 @@
     "refund_TxToSuicide_d0g1v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicide_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -346,9 +339,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x697b",
-                    "hash" : "0x678e6e46145ebdbec395d8aaa96b12d156dc07e70eec2b3bce082f3ce4a105f4",
-                    "mixHash" : "0x46ca90daae38d15d82af570f292922d722692068bdc23a55cc7aaa857e327446",
-                    "nonce" : "0xfa0dffb54021a19a",
+                    "hash" : "0xce5c6587bab03d50aee17447f826133b69edf19d213156dc8fdb8bcd334b0bfa",
+                    "mixHash" : "0x81dadad68f22857d133783b6a31a0548598bbcfff43a69d7b4f6cd4cdddeac80",
+                    "nonce" : "0xc259616f61fdf57b",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
                     "receiptTrie" : "0x40bbf23bd4e483252b521ebcec3acf13024b955e91bc8523a0521b9337be8818",
@@ -357,7 +350,7 @@
                     "transactionsTrie" : "0x421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0762ed63d500f197bd382a95e6359ccfb3fc4bba6f104ef417facd5f85eb3544da0421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57a040bbf23bd4e483252b521ebcec3acf13024b955e91bc8523a0521b9337be8818b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082697b8203e880a046ca90daae38d15d82af570f292922d722692068bdc23a55cc7aaa857e32744688fa0dffb54021a19af861f85f800182ee4b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca070c4db9cd6e4f9991da63856665e47883e1253183e0c507012018e3f5aaecfdba02f2cf7c5954a2fa03ec7ee2bc6cfd72565016707e21326c3d3999f2447d553cec0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0762ed63d500f197bd382a95e6359ccfb3fc4bba6f104ef417facd5f85eb3544da0421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57a040bbf23bd4e483252b521ebcec3acf13024b955e91bc8523a0521b9337be8818b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082697b8203e880a081dadad68f22857d133783b6a31a0548598bbcfff43a69d7b4f6cd4cdddeac8088c259616f61fdf57bf861f85f800182ee4b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca070c4db9cd6e4f9991da63856665e47883e1253183e0c507012018e3f5aaecfdba02f2cf7c5954a2fa03ec7ee2bc6cfd72565016707e21326c3d3999f2447d553cec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -394,7 +387,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x678e6e46145ebdbec395d8aaa96b12d156dc07e70eec2b3bce082f3ce4a105f4",
+        "lastblockhash" : "0xce5c6587bab03d50aee17447f826133b69edf19d213156dc8fdb8bcd334b0bfa",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -440,7 +433,7 @@
     "refund_TxToSuicide_d0g1v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicide_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -452,9 +445,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x2906",
-                    "hash" : "0x532a536662ed39a04c1420631694163df6ae4f863d24c7e448a51d4450b40878",
-                    "mixHash" : "0xbdbc210bf1af9ead284d691bc3d16c218b5e254cf4452a4f64473291ebc3b3cb",
-                    "nonce" : "0xdcadb3e71cac58e8",
+                    "hash" : "0x010bd8e68e62f917496767e5884799e205005890965e842d41b7da3e3324a21a",
+                    "mixHash" : "0xf868b224e8af45a8ca581a9e59d044c61866e641d704722d871d0acaa38add5d",
+                    "nonce" : "0xc490bdd47e3e3f48",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
                     "receiptTrie" : "0xd4b15c293435a5d48086c5f74c34acb137fdd345d11d1210adaa4f280e1860f4",
@@ -463,7 +456,7 @@
                     "transactionsTrie" : "0x421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a48a28ef51d1648c351cc529b9da76a9c8d740c7973d169d24c24c199cbb83ea0421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57a0d4b15c293435a5d48086c5f74c34acb137fdd345d11d1210adaa4f280e1860f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a0bdbc210bf1af9ead284d691bc3d16c218b5e254cf4452a4f64473291ebc3b3cb88dcadb3e71cac58e8f861f85f800182ee4b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca070c4db9cd6e4f9991da63856665e47883e1253183e0c507012018e3f5aaecfdba02f2cf7c5954a2fa03ec7ee2bc6cfd72565016707e21326c3d3999f2447d553cec0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a48a28ef51d1648c351cc529b9da76a9c8d740c7973d169d24c24c199cbb83ea0421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57a0d4b15c293435a5d48086c5f74c34acb137fdd345d11d1210adaa4f280e1860f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a0f868b224e8af45a8ca581a9e59d044c61866e641d704722d871d0acaa38add5d88c490bdd47e3e3f48f861f85f800182ee4b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca070c4db9cd6e4f9991da63856665e47883e1253183e0c507012018e3f5aaecfdba02f2cf7c5954a2fa03ec7ee2bc6cfd72565016707e21326c3d3999f2447d553cec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -500,7 +493,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x532a536662ed39a04c1420631694163df6ae4f863d24c7e448a51d4450b40878",
+        "lastblockhash" : "0x010bd8e68e62f917496767e5884799e205005890965e842d41b7da3e3324a21a",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -546,7 +539,7 @@
     "refund_TxToSuicide_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_TxToSuicide_d0g1v0Filler.json"
         },
         "blocks" : [
@@ -558,9 +551,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x2906",
-                    "hash" : "0xdd790d9f3c10afc91ec1df53d9bc3650ebe60af855e12ffa0307d0712e6657e3",
-                    "mixHash" : "0x75ffe0ea0037c5d4185044f48fd4bda9dbde92a517a12abe72cda0aac7b1416c",
-                    "nonce" : "0x27c957804bc585b7",
+                    "hash" : "0x5aa42ac5d356a836e7312d3cbb47ceb947c44fc0138cbd9de90f92ee0c95789d",
+                    "mixHash" : "0x2c58d83d3228a8f206f42f180320999d566961d7847f3e24570eec20fed62c89",
+                    "nonce" : "0x152edaebf4968d83",
                     "number" : "0x01",
                     "parentHash" : "0xf0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051",
                     "receiptTrie" : "0xd4b15c293435a5d48086c5f74c34acb137fdd345d11d1210adaa4f280e1860f4",
@@ -569,7 +562,7 @@
                     "transactionsTrie" : "0x421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a48a28ef51d1648c351cc529b9da76a9c8d740c7973d169d24c24c199cbb83ea0421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57a0d4b15c293435a5d48086c5f74c34acb137fdd345d11d1210adaa4f280e1860f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a075ffe0ea0037c5d4185044f48fd4bda9dbde92a517a12abe72cda0aac7b1416c8827c957804bc585b7f861f85f800182ee4b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca070c4db9cd6e4f9991da63856665e47883e1253183e0c507012018e3f5aaecfdba02f2cf7c5954a2fa03ec7ee2bc6cfd72565016707e21326c3d3999f2447d553cec0",
+                "rlp" : "0xf9025ef901f7a0f0cb6b195ef5c242d49a2cd8036a62a9d6a9a6728309b59c6c254d794f0c0051a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a48a28ef51d1648c351cc529b9da76a9c8d740c7973d169d24c24c199cbb83ea0421c0bb8cc50f87dfa56ea3de1487524551d09f24d2cf71bfecfc32100058b57a0d4b15c293435a5d48086c5f74c34acb137fdd345d11d1210adaa4f280e1860f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808229068203e880a02c58d83d3228a8f206f42f180320999d566961d7847f3e24570eec20fed62c8988152edaebf4968d83f861f85f800182ee4b94aaae7baea6a6c7c4c2dfeb977efac326af552aaa0a801ca070c4db9cd6e4f9991da63856665e47883e1253183e0c507012018e3f5aaecfdba02f2cf7c5954a2fa03ec7ee2bc6cfd72565016707e21326c3d3999f2447d553cec0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -606,7 +599,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039057e10d75ab5cae85033afec4a621965edb0006fe51103b78dbe1c3c368a42a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdd790d9f3c10afc91ec1df53d9bc3650ebe60af855e12ffa0307d0712e6657e3",
+        "lastblockhash" : "0x5aa42ac5d356a836e7312d3cbb47ceb947c44fc0138cbd9de90f92ee0c95789d",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_changeNonZeroStorage_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_changeNonZeroStorage_d0g0v0.json
index e0cb9156f..016b3e18e 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_changeNonZeroStorage_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_changeNonZeroStorage_d0g0v0.json
@@ -2,7 +2,7 @@
     "refund_changeNonZeroStorage_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_changeNonZeroStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x6596",
-                    "hash" : "0xe1f2f9ccbe138b8aa2b90d129f97858a69436cdb1a4aede15265021a3f51fe59",
-                    "mixHash" : "0x902a053b2a98493955268b0965e331bdd249e4f83642de6effada20872ef7568",
-                    "nonce" : "0xb31ce744f0000beb",
+                    "hash" : "0x52c5f577f037674d362a6e42fbbd8a7f2f4be463792c95de0d2c3029f1c1e1f4",
+                    "mixHash" : "0xda323db3aa4ee9cb78dbc973f424f2889a6540840b16f4694b46b542d96945f6",
+                    "nonce" : "0x60a2683c6ea860e1",
                     "number" : "0x01",
                     "parentHash" : "0xbb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532",
                     "receiptTrie" : "0xab6d3e3083ddefb7cd463e1270c07a126b51ab736a8d8dcc95a910a73ece71e9",
-                    "stateRoot" : "0x2a4e54ba4e35ed31d07ea0e58b046f7fe9adc8e9bf9009de8796e4069cba9779",
+                    "stateRoot" : "0x026a3f8e5a2e0fba223a95d1c1ae7f52294391f54263d8cef2f70c9a38c71de5",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0bb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a4e54ba4e35ed31d07ea0e58b046f7fe9adc8e9bf9009de8796e4069cba9779a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da0ab6d3e3083ddefb7cd463e1270c07a126b51ab736a8d8dcc95a910a73ece71e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265968203e880a0902a053b2a98493955268b0965e331bdd249e4f83642de6effada20872ef756888b31ce744f0000bebf862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "rlp" : "0xf9025ff901f7a0bb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0026a3f8e5a2e0fba223a95d1c1ae7f52294391f54263d8cef2f70c9a38c71de5a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da0ab6d3e3083ddefb7cd463e1270c07a126b51ab736a8d8dcc95a910a73ece71e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265968203e880a0da323db3aa4ee9cb78dbc973f424f2889a6540840b16f4694b46b542d96945f68860a2683c6ea860e1f862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0445cf3016290f36c63929ab6ce63ebefda5c84f0e6c84ebb513e801d23156310a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe1f2f9ccbe138b8aa2b90d129f97858a69436cdb1a4aede15265021a3f51fe59",
+        "lastblockhash" : "0x52c5f577f037674d362a6e42fbbd8a7f2f4be463792c95de0d2c3029f1c1e1f4",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6017600155",
@@ -81,7 +74,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f46596",
+                "balance" : "0x29a2241af62c6596",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -116,7 +109,7 @@
     "refund_changeNonZeroStorage_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_changeNonZeroStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -128,18 +121,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x6596",
-                    "hash" : "0x5f9d9b14bebcfef23af5275451197792e2795bc2f94b170c5aca9bc3ffc0436f",
-                    "mixHash" : "0x09273604caf27dd35307a9885123dc1328f5bc9e4139384f5bc2eb4c0d4775f7",
-                    "nonce" : "0x4ccf1f7b8ca31edb",
+                    "hash" : "0x107cd178bb45733977e43f1dc43acca954d650e41c84ee6c90fc39a5eb6cd04a",
+                    "mixHash" : "0x4c17aa740d35f436825ec45bfc5b672007d024b70e59a421439b375b7039b20e",
+                    "nonce" : "0xb684f510738c9db2",
                     "number" : "0x01",
                     "parentHash" : "0xbb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532",
                     "receiptTrie" : "0xab6d3e3083ddefb7cd463e1270c07a126b51ab736a8d8dcc95a910a73ece71e9",
-                    "stateRoot" : "0x2a4e54ba4e35ed31d07ea0e58b046f7fe9adc8e9bf9009de8796e4069cba9779",
+                    "stateRoot" : "0x34e9599ed38d95a58002bdb9a033f02a17774e72fee5b3078509c1f92e5b5532",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0bb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02a4e54ba4e35ed31d07ea0e58b046f7fe9adc8e9bf9009de8796e4069cba9779a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da0ab6d3e3083ddefb7cd463e1270c07a126b51ab736a8d8dcc95a910a73ece71e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265968203e880a009273604caf27dd35307a9885123dc1328f5bc9e4139384f5bc2eb4c0d4775f7884ccf1f7b8ca31edbf862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "rlp" : "0xf9025ff901f7a0bb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa034e9599ed38d95a58002bdb9a033f02a17774e72fee5b3078509c1f92e5b5532a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da0ab6d3e3083ddefb7cd463e1270c07a126b51ab736a8d8dcc95a910a73ece71e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265968203e880a04c17aa740d35f436825ec45bfc5b672007d024b70e59a421439b375b7039b20e88b684f510738c9db2f862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -176,7 +169,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0445cf3016290f36c63929ab6ce63ebefda5c84f0e6c84ebb513e801d23156310a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5f9d9b14bebcfef23af5275451197792e2795bc2f94b170c5aca9bc3ffc0436f",
+        "lastblockhash" : "0x107cd178bb45733977e43f1dc43acca954d650e41c84ee6c90fc39a5eb6cd04a",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -195,7 +188,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f46596",
+                "balance" : "0x29a2241af62c6596",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -230,7 +223,7 @@
     "refund_changeNonZeroStorage_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_changeNonZeroStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -242,9 +235,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x6596",
-                    "hash" : "0xff420d7184d79eacd27afddf7394ee96317ee28cbc6dc6caff4bbf3b1a6acd1b",
-                    "mixHash" : "0xe0f9b3b25e684d3f95becb5ddbf327a2fa97a6f70873800010f2dcd74e7d897a",
-                    "nonce" : "0x54be95090481bda3",
+                    "hash" : "0x04cb9503f96fe90d5891638d0fdc35be7834fde9a3054fd92ae08c848f7e20a5",
+                    "mixHash" : "0x155d5c6443e438d98577398743c82b114ebbf0a5aa1d9398944310ffdd7e00ea",
+                    "nonce" : "0xe76b159b47d96a8c",
                     "number" : "0x01",
                     "parentHash" : "0xbb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532",
                     "receiptTrie" : "0x8fdeca3b82f7d8c5ec36ee57dc7fbcef1e990b5e12a6c9f5a6cc8348783173f4",
@@ -253,7 +246,7 @@
                     "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0bb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069b46397c00acb37f9ad70fb73a79330f83e16d195e224ca064c5f918fd76399a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da08fdeca3b82f7d8c5ec36ee57dc7fbcef1e990b5e12a6c9f5a6cc8348783173f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265968203e880a0e0f9b3b25e684d3f95becb5ddbf327a2fa97a6f70873800010f2dcd74e7d897a8854be95090481bda3f862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "rlp" : "0xf9025ff901f7a0bb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069b46397c00acb37f9ad70fb73a79330f83e16d195e224ca064c5f918fd76399a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da08fdeca3b82f7d8c5ec36ee57dc7fbcef1e990b5e12a6c9f5a6cc8348783173f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265968203e880a0155d5c6443e438d98577398743c82b114ebbf0a5aa1d9398944310ffdd7e00ea88e76b159b47d96a8cf862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -290,7 +283,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0445cf3016290f36c63929ab6ce63ebefda5c84f0e6c84ebb513e801d23156310a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xff420d7184d79eacd27afddf7394ee96317ee28cbc6dc6caff4bbf3b1a6acd1b",
+        "lastblockhash" : "0x04cb9503f96fe90d5891638d0fdc35be7834fde9a3054fd92ae08c848f7e20a5",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -337,7 +330,7 @@
     "refund_changeNonZeroStorage_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_changeNonZeroStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -349,9 +342,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x6596",
-                    "hash" : "0x30338ed0ad2db0d03c27fdd244feb8c2f2a4952f7430c9ee129ccad684b35da1",
-                    "mixHash" : "0x0c0574738fe078645b8fddf4770bd9c42d80884de1721d9e9c5cef0458b45a3f",
-                    "nonce" : "0x83a472601c39fa3e",
+                    "hash" : "0x272c051634b626908169125e8c33cb4237f5a332223b93b54bd32c2e12f5d811",
+                    "mixHash" : "0x809c35d5e31e87bb58208de2fd2ad93e7d242ef8758c5efefb86305a107e9ab4",
+                    "nonce" : "0x9b005b9b38e5f902",
                     "number" : "0x01",
                     "parentHash" : "0xbb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532",
                     "receiptTrie" : "0x8fdeca3b82f7d8c5ec36ee57dc7fbcef1e990b5e12a6c9f5a6cc8348783173f4",
@@ -360,7 +353,7 @@
                     "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0bb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069b46397c00acb37f9ad70fb73a79330f83e16d195e224ca064c5f918fd76399a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da08fdeca3b82f7d8c5ec36ee57dc7fbcef1e990b5e12a6c9f5a6cc8348783173f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265968203e880a00c0574738fe078645b8fddf4770bd9c42d80884de1721d9e9c5cef0458b45a3f8883a472601c39fa3ef862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "rlp" : "0xf9025ff901f7a0bb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069b46397c00acb37f9ad70fb73a79330f83e16d195e224ca064c5f918fd76399a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da08fdeca3b82f7d8c5ec36ee57dc7fbcef1e990b5e12a6c9f5a6cc8348783173f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265968203e880a0809c35d5e31e87bb58208de2fd2ad93e7d242ef8758c5efefb86305a107e9ab4889b005b9b38e5f902f862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -397,7 +390,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0445cf3016290f36c63929ab6ce63ebefda5c84f0e6c84ebb513e801d23156310a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x30338ed0ad2db0d03c27fdd244feb8c2f2a4952f7430c9ee129ccad684b35da1",
+        "lastblockhash" : "0x272c051634b626908169125e8c33cb4237f5a332223b93b54bd32c2e12f5d811",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -444,7 +437,7 @@
     "refund_changeNonZeroStorage_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_changeNonZeroStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -456,9 +449,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x6596",
-                    "hash" : "0x082c860b250060633f86b38f9908f9c7d6f1784ac4b4b5a7dd37eb0799fe0596",
-                    "mixHash" : "0x155e2e3361e8a30b6f5cabadf8acf9c0891a2bb11c12e234798dc775e60977f9",
-                    "nonce" : "0x4867d81b5fe4b649",
+                    "hash" : "0x49fe0ba4507df31707dfb57bba2b49627cf104ab57073e898bed1274e2f3b63e",
+                    "mixHash" : "0xcd97891abfd5617beefc724238fcafcbee8c24c8f1008eda913c3b7e634605b0",
+                    "nonce" : "0x12f1fb04f0d09baa",
                     "number" : "0x01",
                     "parentHash" : "0xbb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532",
                     "receiptTrie" : "0x8fdeca3b82f7d8c5ec36ee57dc7fbcef1e990b5e12a6c9f5a6cc8348783173f4",
@@ -467,7 +460,7 @@
                     "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0bb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069b46397c00acb37f9ad70fb73a79330f83e16d195e224ca064c5f918fd76399a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da08fdeca3b82f7d8c5ec36ee57dc7fbcef1e990b5e12a6c9f5a6cc8348783173f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265968203e880a0155e2e3361e8a30b6f5cabadf8acf9c0891a2bb11c12e234798dc775e60977f9884867d81b5fe4b649f862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "rlp" : "0xf9025ff901f7a0bb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069b46397c00acb37f9ad70fb73a79330f83e16d195e224ca064c5f918fd76399a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da08fdeca3b82f7d8c5ec36ee57dc7fbcef1e990b5e12a6c9f5a6cc8348783173f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265968203e880a0cd97891abfd5617beefc724238fcafcbee8c24c8f1008eda913c3b7e634605b08812f1fb04f0d09baaf862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -504,7 +497,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0445cf3016290f36c63929ab6ce63ebefda5c84f0e6c84ebb513e801d23156310a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x082c860b250060633f86b38f9908f9c7d6f1784ac4b4b5a7dd37eb0799fe0596",
+        "lastblockhash" : "0x49fe0ba4507df31707dfb57bba2b49627cf104ab57073e898bed1274e2f3b63e",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -551,7 +544,7 @@
     "refund_changeNonZeroStorage_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_changeNonZeroStorage_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -563,9 +556,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x6596",
-                    "hash" : "0xdc2672469e457f434973282452a081a3e15b703d604b22939eeae8a47c57ffa8",
-                    "mixHash" : "0x2727404b30f0883aad52c4eca4bc940c23fdebecc270be0c513922e12df127a4",
-                    "nonce" : "0x35e3be588345c2f1",
+                    "hash" : "0x5b4a7b94ab72fcf3253ccb17381461a8961051855cb84806e3e9a37aa8c6ad02",
+                    "mixHash" : "0xfd6cf5e51c0d63d117c50709d4390184b27883c1b1458b8d8f2c0960abe1fac4",
+                    "nonce" : "0x57f95b7aabbbcddf",
                     "number" : "0x01",
                     "parentHash" : "0xbb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532",
                     "receiptTrie" : "0x8fdeca3b82f7d8c5ec36ee57dc7fbcef1e990b5e12a6c9f5a6cc8348783173f4",
@@ -574,7 +567,7 @@
                     "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a0bb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069b46397c00acb37f9ad70fb73a79330f83e16d195e224ca064c5f918fd76399a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da08fdeca3b82f7d8c5ec36ee57dc7fbcef1e990b5e12a6c9f5a6cc8348783173f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265968203e880a02727404b30f0883aad52c4eca4bc940c23fdebecc270be0c513922e12df127a48835e3be588345c2f1f862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "rlp" : "0xf9025ff901f7a0bb6952b4759b05e7a2ec0defa1856852f3a3d8515a0d515b9d0502989a195532a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069b46397c00acb37f9ad70fb73a79330f83e16d195e224ca064c5f918fd76399a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da08fdeca3b82f7d8c5ec36ee57dc7fbcef1e990b5e12a6c9f5a6cc8348783173f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408265968203e880a0fd6cf5e51c0d63d117c50709d4390184b27883c1b1458b8d8f2c0960abe1fac48857f95b7aabbbcddff862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -611,7 +604,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0445cf3016290f36c63929ab6ce63ebefda5c84f0e6c84ebb513e801d23156310a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdc2672469e457f434973282452a081a3e15b703d604b22939eeae8a47c57ffa8",
+        "lastblockhash" : "0x5b4a7b94ab72fcf3253ccb17381461a8961051855cb84806e3e9a37aa8c6ad02",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_getEtherBack_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_getEtherBack_d0g0v0.json
index 8ab4f9790..f5123663f 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_getEtherBack_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_getEtherBack_d0g0v0.json
@@ -2,7 +2,7 @@
     "refund_getEtherBack_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_getEtherBack_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x037c94",
                     "gasUsed" : "0x32cb",
-                    "hash" : "0x175bb685921ffebdd0d287b6d72ce7d5939a445c142be1bacee820d74ab7110e",
-                    "mixHash" : "0x90541211314570c93b4f600c885f8d9ef0f59ae7b3f8b673271fd7b66908155b",
-                    "nonce" : "0x8fce71e8effd383c",
+                    "hash" : "0x134627f626ddfef3080357e29ac9f14e2717476bf1b8b57e2ef3ea52d19606ca",
+                    "mixHash" : "0x6910e83484de48c939dd9eaf447934613f29fb2074fe009ca0b557d2d9e39901",
+                    "nonce" : "0x047e0bd636d355a7",
                     "number" : "0x01",
                     "parentHash" : "0x5ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0",
                     "receiptTrie" : "0xbf746beefa19da059d5810cb7b32cde1e5afa402222d0cbeea17736d3f724c70",
-                    "stateRoot" : "0x898a0f26b0907e4d6d869c3bc00cf2059b090ec0eaf518e4b39f34724aa02928",
+                    "stateRoot" : "0xbd3ec43b5a1527889a0168c77df5614b96596c41545cbf59cf73c07ed812faca",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0898a0f26b0907e4d6d869c3bc00cf2059b090ec0eaf518e4b39f34724aa02928a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da0bf746beefa19da059d5810cb7b32cde1e5afa402222d0cbeea17736d3f724c70b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183037c948232cb8203e880a090541211314570c93b4f600c885f8d9ef0f59ae7b3f8b673271fd7b66908155b888fce71e8effd383cf862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "rlp" : "0xf9025ff901f7a05ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd3ec43b5a1527889a0168c77df5614b96596c41545cbf59cf73c07ed812facaa057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da0bf746beefa19da059d5810cb7b32cde1e5afa402222d0cbeea17736d3f724c70b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183037c948232cb8203e880a06910e83484de48c939dd9eaf447934613f29fb2074fe009ca0b557d2d9e3990188047e0bd636d355a7f862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -62,16 +62,9 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0635db71a4815d48946f7a1a66cfc0a271fa0f98716f190c2771a59ec6fcb6e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083037c94808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x175bb685921ffebdd0d287b6d72ce7d5939a445c142be1bacee820d74ab7110e",
+        "lastblockhash" : "0x134627f626ddfef3080357e29ac9f14e2717476bf1b8b57e2ef3ea52d19606ca",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a764000a",
                 "code" : "0x6000600155",
@@ -80,7 +73,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f432cb",
+                "balance" : "0x29a2241af62c32cb",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -115,7 +108,7 @@
     "refund_getEtherBack_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_getEtherBack_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -127,18 +120,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x037c94",
                     "gasUsed" : "0x32cb",
-                    "hash" : "0xf9123391efc86d10537d016e62411f00853502351ae57fe3f4d875619667db19",
-                    "mixHash" : "0x726b748b7a10cd3480ccc4768e23747c0277164351e3646e14ef337513094118",
-                    "nonce" : "0xced455131ca976ad",
+                    "hash" : "0x381a5f930c7469a466ee009ffcbe3811086286f85ba718d8828b5b3f3333029e",
+                    "mixHash" : "0x192a5d6c36779fe901133b362dd5ea493d1ff2f78bce79309d4fdf745a853c0b",
+                    "nonce" : "0x7c0251890774708d",
                     "number" : "0x01",
                     "parentHash" : "0x5ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0",
                     "receiptTrie" : "0xbf746beefa19da059d5810cb7b32cde1e5afa402222d0cbeea17736d3f724c70",
-                    "stateRoot" : "0x898a0f26b0907e4d6d869c3bc00cf2059b090ec0eaf518e4b39f34724aa02928",
+                    "stateRoot" : "0xcb57e37700ab6c97a89451f22253238c279994440368d05f360c62d55bfb1137",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0898a0f26b0907e4d6d869c3bc00cf2059b090ec0eaf518e4b39f34724aa02928a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da0bf746beefa19da059d5810cb7b32cde1e5afa402222d0cbeea17736d3f724c70b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183037c948232cb8203e880a0726b748b7a10cd3480ccc4768e23747c0277164351e3646e14ef33751309411888ced455131ca976adf862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "rlp" : "0xf9025ff901f7a05ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cb57e37700ab6c97a89451f22253238c279994440368d05f360c62d55bfb1137a057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da0bf746beefa19da059d5810cb7b32cde1e5afa402222d0cbeea17736d3f724c70b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183037c948232cb8203e880a0192a5d6c36779fe901133b362dd5ea493d1ff2f78bce79309d4fdf745a853c0b887c0251890774708df862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -175,7 +168,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0635db71a4815d48946f7a1a66cfc0a271fa0f98716f190c2771a59ec6fcb6e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083037c94808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf9123391efc86d10537d016e62411f00853502351ae57fe3f4d875619667db19",
+        "lastblockhash" : "0x381a5f930c7469a466ee009ffcbe3811086286f85ba718d8828b5b3f3333029e",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -193,7 +186,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f432cb",
+                "balance" : "0x29a2241af62c32cb",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -228,7 +221,7 @@
     "refund_getEtherBack_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_getEtherBack_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -240,9 +233,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x037c94",
                     "gasUsed" : "0x32cb",
-                    "hash" : "0x2c0ed24c4e5976d91d9c99652ee769b6dbdfd7b982c299f6151e010837cf5b4e",
-                    "mixHash" : "0xcd444f7ee97c36ea762e77ad1eb2ef50ca853743ed5dc5301c0c1d5921d140a1",
-                    "nonce" : "0xd1af03d661672014",
+                    "hash" : "0xfc6d59f51956ae94cd2bc30493983b0d3a1a188a4dafd60143a75609614e27e4",
+                    "mixHash" : "0x7410f79be3bdffcae8a91f8c7a070b37e02a18b1ed72df0654e51c9e8b007ec5",
+                    "nonce" : "0x21fe525c46c6562f",
                     "number" : "0x01",
                     "parentHash" : "0x5ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0",
                     "receiptTrie" : "0x9a8f2594bc340e04d667c3033d4ae10f3b8cb293a02e330011db139a0ec5ffde",
@@ -251,7 +244,7 @@
                     "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d79d799eacabbaaa2cede8b5ad1ea8a715cb7c0f4071056547ef9369f86e9f0da057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da09a8f2594bc340e04d667c3033d4ae10f3b8cb293a02e330011db139a0ec5ffdeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183037c948232cb8203e880a0cd444f7ee97c36ea762e77ad1eb2ef50ca853743ed5dc5301c0c1d5921d140a188d1af03d661672014f862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "rlp" : "0xf9025ff901f7a05ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d79d799eacabbaaa2cede8b5ad1ea8a715cb7c0f4071056547ef9369f86e9f0da057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da09a8f2594bc340e04d667c3033d4ae10f3b8cb293a02e330011db139a0ec5ffdeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183037c948232cb8203e880a07410f79be3bdffcae8a91f8c7a070b37e02a18b1ed72df0654e51c9e8b007ec58821fe525c46c6562ff862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -288,7 +281,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0635db71a4815d48946f7a1a66cfc0a271fa0f98716f190c2771a59ec6fcb6e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083037c94808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2c0ed24c4e5976d91d9c99652ee769b6dbdfd7b982c299f6151e010837cf5b4e",
+        "lastblockhash" : "0xfc6d59f51956ae94cd2bc30493983b0d3a1a188a4dafd60143a75609614e27e4",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -334,7 +327,7 @@
     "refund_getEtherBack_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_getEtherBack_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -346,9 +339,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x037c94",
                     "gasUsed" : "0x32cb",
-                    "hash" : "0x3f11d10227e10bd237e18c348544e5f84a8e154c0ef4f3459fc085019a0f756d",
-                    "mixHash" : "0x6c692dd3ab0b1537c50c33d82426e041b3fe1d7a8cbc63813be95b6a86f3a48d",
-                    "nonce" : "0x51fc93468ffbe56f",
+                    "hash" : "0xa980080787ba14b68103d90e4cc6146be01f18bb58d6322597cfbcdf3694aab2",
+                    "mixHash" : "0x679d895da08df7ad3d6e81ceef5899c090c09ac3e3c285fb65d2bc0e6b4049ba",
+                    "nonce" : "0xf06dabd453eed30b",
                     "number" : "0x01",
                     "parentHash" : "0x5ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0",
                     "receiptTrie" : "0x9a8f2594bc340e04d667c3033d4ae10f3b8cb293a02e330011db139a0ec5ffde",
@@ -357,7 +350,7 @@
                     "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d79d799eacabbaaa2cede8b5ad1ea8a715cb7c0f4071056547ef9369f86e9f0da057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da09a8f2594bc340e04d667c3033d4ae10f3b8cb293a02e330011db139a0ec5ffdeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183037c948232cb8203e880a06c692dd3ab0b1537c50c33d82426e041b3fe1d7a8cbc63813be95b6a86f3a48d8851fc93468ffbe56ff862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "rlp" : "0xf9025ff901f7a05ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d79d799eacabbaaa2cede8b5ad1ea8a715cb7c0f4071056547ef9369f86e9f0da057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da09a8f2594bc340e04d667c3033d4ae10f3b8cb293a02e330011db139a0ec5ffdeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183037c948232cb8203e880a0679d895da08df7ad3d6e81ceef5899c090c09ac3e3c285fb65d2bc0e6b4049ba88f06dabd453eed30bf862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -394,7 +387,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0635db71a4815d48946f7a1a66cfc0a271fa0f98716f190c2771a59ec6fcb6e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083037c94808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3f11d10227e10bd237e18c348544e5f84a8e154c0ef4f3459fc085019a0f756d",
+        "lastblockhash" : "0xa980080787ba14b68103d90e4cc6146be01f18bb58d6322597cfbcdf3694aab2",
         "network" : "EIP158",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -440,7 +433,7 @@
     "refund_getEtherBack_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_getEtherBack_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -452,9 +445,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x037c94",
                     "gasUsed" : "0x32cb",
-                    "hash" : "0x6c1b68aafc6f1c966ef3726282c2fd77a6119eaa2773466103b8b955a12694e7",
-                    "mixHash" : "0x771bb712dbb8883bdde03d09792bf2ef0e1b87f3e0a9f30f555e0f521b588e3c",
-                    "nonce" : "0x27ad3bd51950ec54",
+                    "hash" : "0xca63cd034270ac800c5290dbd36da8b2e35be512a2a121761723d99334d56bc2",
+                    "mixHash" : "0xa5d503c14f6a43821435631cf70ae1e7013ae87c85d324187688853ef64960af",
+                    "nonce" : "0x9bc6566b8cc40060",
                     "number" : "0x01",
                     "parentHash" : "0x5ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0",
                     "receiptTrie" : "0x9a8f2594bc340e04d667c3033d4ae10f3b8cb293a02e330011db139a0ec5ffde",
@@ -463,7 +456,7 @@
                     "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d79d799eacabbaaa2cede8b5ad1ea8a715cb7c0f4071056547ef9369f86e9f0da057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da09a8f2594bc340e04d667c3033d4ae10f3b8cb293a02e330011db139a0ec5ffdeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183037c948232cb8203e880a0771bb712dbb8883bdde03d09792bf2ef0e1b87f3e0a9f30f555e0f521b588e3c8827ad3bd51950ec54f862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "rlp" : "0xf9025ff901f7a05ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d79d799eacabbaaa2cede8b5ad1ea8a715cb7c0f4071056547ef9369f86e9f0da057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da09a8f2594bc340e04d667c3033d4ae10f3b8cb293a02e330011db139a0ec5ffdeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183037c948232cb8203e880a0a5d503c14f6a43821435631cf70ae1e7013ae87c85d324187688853ef64960af889bc6566b8cc40060f862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -500,7 +493,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0635db71a4815d48946f7a1a66cfc0a271fa0f98716f190c2771a59ec6fcb6e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083037c94808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6c1b68aafc6f1c966ef3726282c2fd77a6119eaa2773466103b8b955a12694e7",
+        "lastblockhash" : "0xca63cd034270ac800c5290dbd36da8b2e35be512a2a121761723d99334d56bc2",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -546,7 +539,7 @@
     "refund_getEtherBack_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_getEtherBack_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -558,9 +551,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x037c94",
                     "gasUsed" : "0x32cb",
-                    "hash" : "0x02a4eae8dc7f0d2781651380b849edbb134f1577b9ad02cc5e11ee89ae5a9f53",
-                    "mixHash" : "0xc9da694379e6722c0ffe8a4ab6c050cdbbb74e0e7f50d64f87fd7b365d2e9d3e",
-                    "nonce" : "0x88ded8d004d7b02f",
+                    "hash" : "0x9ae044c870e391c6315ad93c009f81cee400688397822cbae53715c903bb9b0b",
+                    "mixHash" : "0xa9cb3daf87f916985dcfd70cb693968d8310b538b6f690deab75d193bfca9a9b",
+                    "nonce" : "0x9dbc5a1332531a31",
                     "number" : "0x01",
                     "parentHash" : "0x5ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0",
                     "receiptTrie" : "0x9a8f2594bc340e04d667c3033d4ae10f3b8cb293a02e330011db139a0ec5ffde",
@@ -569,7 +562,7 @@
                     "transactionsTrie" : "0x57cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d79d799eacabbaaa2cede8b5ad1ea8a715cb7c0f4071056547ef9369f86e9f0da057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da09a8f2594bc340e04d667c3033d4ae10f3b8cb293a02e330011db139a0ec5ffdeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183037c948232cb8203e880a0c9da694379e6722c0ffe8a4ab6c050cdbbb74e0e7f50d64f87fd7b365d2e9d3e8888ded8d004d7b02ff862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
+                "rlp" : "0xf9025ff901f7a05ddfa2ce134af07dfe910b731ca1db68028cb4918544af981b0c05e8d27e3ba0a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d79d799eacabbaaa2cede8b5ad1ea8a715cb7c0f4071056547ef9369f86e9f0da057cd1208949456b0bed5e02fa41b2e5c3c7d3af1083b667da1de3dcdac728f2da09a8f2594bc340e04d667c3033d4ae10f3b8cb293a02e330011db139a0ec5ffdeb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183037c948232cb8203e880a0a9cb3daf87f916985dcfd70cb693968d8310b538b6f690deab75d193bfca9a9b889dbc5a1332531a31f862f860800183037c9494095e7baea6a6c7c4c2dfeb977efac326af552d870a801ba0101438d10b20f52fc58d35ed7158388765cf9fd61744b25bb7bd9de3332e14d3a05a8a9e5fbcda8f3e48da6a2cb00105fcfe3a5d7285dd6daf7de6ebc63451e6bac0",
                 "transactions" : [
                     {
                         "data" : "",
@@ -606,7 +599,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0635db71a4815d48946f7a1a66cfc0a271fa0f98716f190c2771a59ec6fcb6e9fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083037c94808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x02a4eae8dc7f0d2781651380b849edbb134f1577b9ad02cc5e11ee89ae5a9f53",
+        "lastblockhash" : "0x9ae044c870e391c6315ad93c009f81cee400688397822cbae53715c903bb9b0b",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_multimpleSuicide_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_multimpleSuicide_d0g0v0.json
index 6e64ad397..e1e5b7edb 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_multimpleSuicide_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_multimpleSuicide_d0g0v0.json
@@ -2,7 +2,7 @@
     "refund_multimpleSuicide_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_multimpleSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x4154",
-                    "hash" : "0xeea198453771799efd91fa3fef1005e19269cfae98791cc384e8b2f0fdd2c977",
-                    "mixHash" : "0x23b6307a87ba19eb65426cf2916f1c10c00507cb212fd7bf51b317defdda33f6",
-                    "nonce" : "0xbec807b958e2da14",
+                    "hash" : "0xd2e43f7bb2546e35143c820b917824cbfbd12fe4d81e0ce920c37c990f04f507",
+                    "mixHash" : "0x6eef8717f8c6d0f40407387c328d77cb5b0ee539cf3ab04fb1b18329045b4a07",
+                    "nonce" : "0x17ee2bdc8e8414ff",
                     "number" : "0x01",
                     "parentHash" : "0x26ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4b",
                     "receiptTrie" : "0x2ab355f6ada4631292453b5e8b436026295531df25a4ca97b2b94d31c34d0c3c",
-                    "stateRoot" : "0xd469f4f0636ac70d7c3d3cdbefbfbd4db732a0607aec822a1a69c8e877647242",
+                    "stateRoot" : "0x427b5a104020b205a84df021ca742cfd21a80a8a24b24a78a41068de2c220c55",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f7a026ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d469f4f0636ac70d7c3d3cdbefbfbd4db732a0607aec822a1a69c8e877647242a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a02ab355f6ada4631292453b5e8b436026295531df25a4ca97b2b94d31c34d0c3cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408241548203e880a023b6307a87ba19eb65426cf2916f1c10c00507cb212fd7bf51b317defdda33f688bec807b958e2da14f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
+                "rlp" : "0xf90263f901f7a026ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0427b5a104020b205a84df021ca742cfd21a80a8a24b24a78a41068de2c220c55a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a02ab355f6ada4631292453b5e8b436026295531df25a4ca97b2b94d31c34d0c3cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408241548203e880a06eef8717f8c6d0f40407387c328d77cb5b0ee539cf3ab04fb1b18329045b4a078817ee2bdc8e8414fff866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,18 +62,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03de4c88ce71baf0bf8c4b23828faf822f30a1b43a22485fb23fea9ca19765f90a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeea198453771799efd91fa3fef1005e19269cfae98791cc384e8b2f0fdd2c977",
+        "lastblockhash" : "0xd2e43f7bb2546e35143c820b917824cbfbd12fe4d81e0ce920c37c990f04f507",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f44154",
+                "balance" : "0x29a2241af62c4154",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -107,7 +100,7 @@
     "refund_multimpleSuicide_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_multimpleSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +112,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x4154",
-                    "hash" : "0x7bd029ebca586693cb22f7260183d309866847957232ef2bea853115a16b057c",
-                    "mixHash" : "0xd0ed9c6f98298956abf76878076640749d9e69a7d721144da6cdeb714e3d16a1",
-                    "nonce" : "0xc1909ff88da1ff48",
+                    "hash" : "0x19c92632648885fee95e8774c6091633cb5c456c077841f5b0b5062aba66e44a",
+                    "mixHash" : "0x8faa49dc63c55aa6c185ab7fa6c814a7bc793a641d75ff5d223d98955bd34574",
+                    "nonce" : "0x0c01dcbf2e0bd92c",
                     "number" : "0x01",
                     "parentHash" : "0x26ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4b",
                     "receiptTrie" : "0x2ab355f6ada4631292453b5e8b436026295531df25a4ca97b2b94d31c34d0c3c",
-                    "stateRoot" : "0xd469f4f0636ac70d7c3d3cdbefbfbd4db732a0607aec822a1a69c8e877647242",
+                    "stateRoot" : "0xca0ad87db25a3dfa0f05a62c686a6592fd593133fefa6cfd76835b6f84578c1f",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f7a026ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d469f4f0636ac70d7c3d3cdbefbfbd4db732a0607aec822a1a69c8e877647242a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a02ab355f6ada4631292453b5e8b436026295531df25a4ca97b2b94d31c34d0c3cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408241548203e880a0d0ed9c6f98298956abf76878076640749d9e69a7d721144da6cdeb714e3d16a188c1909ff88da1ff48f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
+                "rlp" : "0xf90263f901f7a026ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca0ad87db25a3dfa0f05a62c686a6592fd593133fefa6cfd76835b6f84578c1fa04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a02ab355f6ada4631292453b5e8b436026295531df25a4ca97b2b94d31c34d0c3cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408241548203e880a08faa49dc63c55aa6c185ab7fa6c814a7bc793a641d75ff5d223d98955bd34574880c01dcbf2e0bd92cf866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -167,7 +160,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03de4c88ce71baf0bf8c4b23828faf822f30a1b43a22485fb23fea9ca19765f90a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7bd029ebca586693cb22f7260183d309866847957232ef2bea853115a16b057c",
+        "lastblockhash" : "0x19c92632648885fee95e8774c6091633cb5c456c077841f5b0b5062aba66e44a",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -178,7 +171,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f44154",
+                "balance" : "0x29a2241af62c4154",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -212,7 +205,7 @@
     "refund_multimpleSuicide_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_multimpleSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +217,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x4104",
-                    "hash" : "0x8a48df0767f5c5a9f24dc611c3c4deab529bfb9430f404a5938a2598e93e92c6",
-                    "mixHash" : "0x21f018eccb4851c56ad2d05a7a14206e485c1323a12d5f8cdf219b6e80393b44",
-                    "nonce" : "0xfbc0749512c2a30a",
+                    "hash" : "0x44f2aee43a12e4efaff34e86086edee4b83f47374fa83bbaf8f6447314544203",
+                    "mixHash" : "0xa37bacba9c72d98e87b3727280f9b64ab17bdedc5c16bbc5cad76aa059ea82e9",
+                    "nonce" : "0xa8077b706d26f413",
                     "number" : "0x01",
                     "parentHash" : "0x26ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4b",
                     "receiptTrie" : "0x34532f100dfed5223409562f738817d86f50cd29fbe3623268cdd90ff1935e94",
@@ -235,7 +228,7 @@
                     "transactionsTrie" : "0x4f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f7a026ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069a1ef0bbd1465b8898c883c68d085963bd1816592550f04ede94930d531ca8aa04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a034532f100dfed5223409562f738817d86f50cd29fbe3623268cdd90ff1935e94b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408241048203e880a021f018eccb4851c56ad2d05a7a14206e485c1323a12d5f8cdf219b6e80393b4488fbc0749512c2a30af866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
+                "rlp" : "0xf90263f901f7a026ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069a1ef0bbd1465b8898c883c68d085963bd1816592550f04ede94930d531ca8aa04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a034532f100dfed5223409562f738817d86f50cd29fbe3623268cdd90ff1935e94b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408241048203e880a0a37bacba9c72d98e87b3727280f9b64ab17bdedc5c16bbc5cad76aa059ea82e988a8077b706d26f413f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -272,7 +265,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03de4c88ce71baf0bf8c4b23828faf822f30a1b43a22485fb23fea9ca19765f90a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8a48df0767f5c5a9f24dc611c3c4deab529bfb9430f404a5938a2598e93e92c6",
+        "lastblockhash" : "0x44f2aee43a12e4efaff34e86086edee4b83f47374fa83bbaf8f6447314544203",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -310,7 +303,7 @@
     "refund_multimpleSuicide_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_multimpleSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -322,9 +315,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x4154",
-                    "hash" : "0x6542c438e221e87d944a32675f26e51f44a7705e4cae53ba8ad699c4cbbe6cab",
-                    "mixHash" : "0x5710e4029e0632df06a35fc2407a189e93c693af76a6faeb22c080c1b409e8be",
-                    "nonce" : "0x9880d7a69e095639",
+                    "hash" : "0xe2aa29290981310083208fe693c22f9e768ba345a292cf61c0d8c6f3d0d6fbb7",
+                    "mixHash" : "0x2db5e74bca6d4c2049824c8b96a91e50a10928784d6b613e17f16dff4535fd95",
+                    "nonce" : "0x61442f09210cfee9",
                     "number" : "0x01",
                     "parentHash" : "0x26ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4b",
                     "receiptTrie" : "0x85b54e85e29864066a2bb39857fa3a2cc132361f160c4ef51c3058a3d049809f",
@@ -333,7 +326,7 @@
                     "transactionsTrie" : "0x4f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f7a026ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3726515be923f2507e5d41bcf3fc3e0c9814037da6849c20c54e5a977f43910a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a085b54e85e29864066a2bb39857fa3a2cc132361f160c4ef51c3058a3d049809fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408241548203e880a05710e4029e0632df06a35fc2407a189e93c693af76a6faeb22c080c1b409e8be889880d7a69e095639f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
+                "rlp" : "0xf90263f901f7a026ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3726515be923f2507e5d41bcf3fc3e0c9814037da6849c20c54e5a977f43910a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a085b54e85e29864066a2bb39857fa3a2cc132361f160c4ef51c3058a3d049809fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408241548203e880a02db5e74bca6d4c2049824c8b96a91e50a10928784d6b613e17f16dff4535fd958861442f09210cfee9f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -370,7 +363,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03de4c88ce71baf0bf8c4b23828faf822f30a1b43a22485fb23fea9ca19765f90a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6542c438e221e87d944a32675f26e51f44a7705e4cae53ba8ad699c4cbbe6cab",
+        "lastblockhash" : "0xe2aa29290981310083208fe693c22f9e768ba345a292cf61c0d8c6f3d0d6fbb7",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -408,7 +401,7 @@
     "refund_multimpleSuicide_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_multimpleSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -420,9 +413,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x2ae8",
-                    "hash" : "0xd0ad5a511018e5fa8d36fb8bb110e50e4057eb9e8dcd428aa683d41f5da80e84",
-                    "mixHash" : "0xa8d4bc151702a598d216a98eb7bfff27c216450bc1dda8c5cf69d1002008a6ab",
-                    "nonce" : "0x6a04b4be9ecc2961",
+                    "hash" : "0x90c5d9e0dd40b15446be33eb46c0cc552c5c948435d6e31bb174e018c8d5a42e",
+                    "mixHash" : "0x943427e8ddb84e887893cdd1d1a6f90b56fcd265cb6f24f19d59e076a9f3c32f",
+                    "nonce" : "0xbe6adf0325092153",
                     "number" : "0x01",
                     "parentHash" : "0x26ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4b",
                     "receiptTrie" : "0xf4098508f7c4707a9fd458f407a31ecb5c1ac6ce14fe04f0fba7dc64faeecefc",
@@ -431,7 +424,7 @@
                     "transactionsTrie" : "0x4f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f7a026ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003e8f44fa8651d746e93d26218f793fda70e5f0caa7ba1c0e140532aae143701a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a0f4098508f7c4707a9fd458f407a31ecb5c1ac6ce14fe04f0fba7dc64faeecefcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240822ae88203e880a0a8d4bc151702a598d216a98eb7bfff27c216450bc1dda8c5cf69d1002008a6ab886a04b4be9ecc2961f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
+                "rlp" : "0xf90263f901f7a026ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003e8f44fa8651d746e93d26218f793fda70e5f0caa7ba1c0e140532aae143701a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a0f4098508f7c4707a9fd458f407a31ecb5c1ac6ce14fe04f0fba7dc64faeecefcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240822ae88203e880a0943427e8ddb84e887893cdd1d1a6f90b56fcd265cb6f24f19d59e076a9f3c32f88be6adf0325092153f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -468,7 +461,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03de4c88ce71baf0bf8c4b23828faf822f30a1b43a22485fb23fea9ca19765f90a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd0ad5a511018e5fa8d36fb8bb110e50e4057eb9e8dcd428aa683d41f5da80e84",
+        "lastblockhash" : "0x90c5d9e0dd40b15446be33eb46c0cc552c5c948435d6e31bb174e018c8d5a42e",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -506,7 +499,7 @@
     "refund_multimpleSuicide_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_multimpleSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -518,9 +511,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x2ae8",
-                    "hash" : "0xa9bd88d74dc111a676bfbea9461ad0a6a3b1f74ebedb449e79586bae85043a93",
-                    "mixHash" : "0x8f4fe6317ccdbc07acde5beebaa09fa027306b58266d47d8e2bbfc343163ba86",
-                    "nonce" : "0xfa2d87e76003c589",
+                    "hash" : "0xffc1f9231fca436c862da1dadb2da057929a41bd9473343751f4b760ced4f9c3",
+                    "mixHash" : "0xaa9fc6c4ff0f31b6aec154d96c4dfad44ca41ede95f1949b3999462adf61eab9",
+                    "nonce" : "0x4a3397da123273a8",
                     "number" : "0x01",
                     "parentHash" : "0x26ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4b",
                     "receiptTrie" : "0xf4098508f7c4707a9fd458f407a31ecb5c1ac6ce14fe04f0fba7dc64faeecefc",
@@ -529,7 +522,7 @@
                     "transactionsTrie" : "0x4f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f7a026ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003e8f44fa8651d746e93d26218f793fda70e5f0caa7ba1c0e140532aae143701a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a0f4098508f7c4707a9fd458f407a31ecb5c1ac6ce14fe04f0fba7dc64faeecefcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240822ae88203e880a08f4fe6317ccdbc07acde5beebaa09fa027306b58266d47d8e2bbfc343163ba8688fa2d87e76003c589f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
+                "rlp" : "0xf90263f901f7a026ad69931fd400937498df4bfdf791fda8414567de3dff004e20eeb9ea6fce4ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa003e8f44fa8651d746e93d26218f793fda70e5f0caa7ba1c0e140532aae143701a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a0f4098508f7c4707a9fd458f407a31ecb5c1ac6ce14fe04f0fba7dc64faeecefcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240822ae88203e880a0aa9fc6c4ff0f31b6aec154d96c4dfad44ca41ede95f1949b3999462adf61eab9884a3397da123273a8f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -566,7 +559,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03de4c88ce71baf0bf8c4b23828faf822f30a1b43a22485fb23fea9ca19765f90a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa9bd88d74dc111a676bfbea9461ad0a6a3b1f74ebedb449e79586bae85043a93",
+        "lastblockhash" : "0xffc1f9231fca436c862da1dadb2da057929a41bd9473343751f4b760ced4f9c3",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stRefundTest/refund_singleSuicide_d0g0v0.json b/BlockchainTests/GeneralStateTests/stRefundTest/refund_singleSuicide_d0g0v0.json
index b6d2eddd4..eae29af88 100644
--- a/BlockchainTests/GeneralStateTests/stRefundTest/refund_singleSuicide_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stRefundTest/refund_singleSuicide_d0g0v0.json
@@ -2,7 +2,7 @@
     "refund_singleSuicide_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_singleSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -14,18 +14,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x35cb",
-                    "hash" : "0x2988711a2149893369cdd71095e4a402355273f711cfc947e5060759acaebdaa",
-                    "mixHash" : "0x804a6b2e3d0b55239eb399beab7b3768e1d291e3dda52ef3f86e45992c7dba81",
-                    "nonce" : "0xdb2a7c048666ed3b",
+                    "hash" : "0x4db4e37d7d14054fc6cf4932c8d30b806bc7332ed2600538cc69c1eb3c1bef5c",
+                    "mixHash" : "0xa8125377482c25cd16f855dc639c89e888b59e7c12ec8fb3b5d1cde077f303c5",
+                    "nonce" : "0x1aee3a9e22eddf83",
                     "number" : "0x01",
                     "parentHash" : "0x76de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6",
                     "receiptTrie" : "0x9d09fca691e64e3756bc90fe3c5cfa4a19b52d6265c47e5aaf4e642534897e39",
-                    "stateRoot" : "0x5f1b9e33699ead3ab7c7b64847ebbcd1a01916b69f6d04a6e75e7cb8afe9bf2a",
+                    "stateRoot" : "0xb007a225e67f6009761faeba316df64b62adb1e3220c529a87856114aa066730",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f7a076de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05f1b9e33699ead3ab7c7b64847ebbcd1a01916b69f6d04a6e75e7cb8afe9bf2aa04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a09d09fca691e64e3756bc90fe3c5cfa4a19b52d6265c47e5aaf4e642534897e39b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408235cb8203e880a0804a6b2e3d0b55239eb399beab7b3768e1d291e3dda52ef3f86e45992c7dba8188db2a7c048666ed3bf866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
+                "rlp" : "0xf90263f901f7a076de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b007a225e67f6009761faeba316df64b62adb1e3220c529a87856114aa066730a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a09d09fca691e64e3756bc90fe3c5cfa4a19b52d6265c47e5aaf4e642534897e39b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408235cb8203e880a0a8125377482c25cd16f855dc639c89e888b59e7c12ec8fb3b5d1cde077f303c5881aee3a9e22eddf83f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -62,18 +62,11 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a38e179095b269154c1776ef395730c69e81ff6e8df7fb6b70abeaa7ccc0fec8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2988711a2149893369cdd71095e4a402355273f711cfc947e5060759acaebdaa",
+        "lastblockhash" : "0x4db4e37d7d14054fc6cf4932c8d30b806bc7332ed2600538cc69c1eb3c1bef5c",
         "network" : "Byzantium",
         "postState" : {
-            "0x00000000000000000000000000000000000000f0" : {
-                "balance" : "0x00",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f435cb",
+                "balance" : "0x29a2241af62c35cb",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -107,7 +100,7 @@
     "refund_singleSuicide_d0g0v0_Constantinople" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_singleSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -119,18 +112,18 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x35cb",
-                    "hash" : "0xcb10db499dccc4ba66afb010db2165c096b0a9c569ed2baa79d406154300d2ed",
-                    "mixHash" : "0x0d085f758d0f6b555a118d973587311d0a4babff4f00d7f25cdd7ae9b5babc5d",
-                    "nonce" : "0x243f5e36f9f484f2",
+                    "hash" : "0x45d1752e93978c573f08dc6718f639f6a74a2d16684a753dc63e76e86e30861a",
+                    "mixHash" : "0x306d8729f7bf861ab6feef54b2c4807ebd2045805aad9c9b50a668ea5dcc663e",
+                    "nonce" : "0x9f667fa40ae025f0",
                     "number" : "0x01",
                     "parentHash" : "0x76de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6",
                     "receiptTrie" : "0x9d09fca691e64e3756bc90fe3c5cfa4a19b52d6265c47e5aaf4e642534897e39",
-                    "stateRoot" : "0x5f1b9e33699ead3ab7c7b64847ebbcd1a01916b69f6d04a6e75e7cb8afe9bf2a",
+                    "stateRoot" : "0xe68e1388401f8ef1384371d36c1dd2e47c97fea9a5606f6e982a68686218d483",
                     "timestamp" : "0x03e8",
                     "transactionsTrie" : "0x4f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f7a076de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05f1b9e33699ead3ab7c7b64847ebbcd1a01916b69f6d04a6e75e7cb8afe9bf2aa04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a09d09fca691e64e3756bc90fe3c5cfa4a19b52d6265c47e5aaf4e642534897e39b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408235cb8203e880a00d085f758d0f6b555a118d973587311d0a4babff4f00d7f25cdd7ae9b5babc5d88243f5e36f9f484f2f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
+                "rlp" : "0xf90263f901f7a076de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e68e1388401f8ef1384371d36c1dd2e47c97fea9a5606f6e982a68686218d483a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a09d09fca691e64e3756bc90fe3c5cfa4a19b52d6265c47e5aaf4e642534897e39b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408235cb8203e880a0306d8729f7bf861ab6feef54b2c4807ebd2045805aad9c9b50a668ea5dcc663e889f667fa40ae025f0f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -167,7 +160,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a38e179095b269154c1776ef395730c69e81ff6e8df7fb6b70abeaa7ccc0fec8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcb10db499dccc4ba66afb010db2165c096b0a9c569ed2baa79d406154300d2ed",
+        "lastblockhash" : "0x45d1752e93978c573f08dc6718f639f6a74a2d16684a753dc63e76e86e30861a",
         "network" : "Constantinople",
         "postState" : {
             "0x00000000000000000000000000000000000000f0" : {
@@ -178,7 +171,7 @@
                 }
             },
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f435cb",
+                "balance" : "0x29a2241af62c35cb",
                 "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
@@ -212,7 +205,7 @@
     "refund_singleSuicide_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_singleSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -224,9 +217,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x358f",
-                    "hash" : "0xc612d4e2199906c35d36cde82b12d5e44a34d2d5d5817af1f36b7fb53209a314",
-                    "mixHash" : "0xca29b649bf42b58c8fbe29486c34f3e96f1b2d6bf9008cf2077f8806ea2d4bfe",
-                    "nonce" : "0xe4f2d1d2344c0b0e",
+                    "hash" : "0x22af9868a9b85bf35bffea864dd8061cbfab2281696a2085d03dcfb7e2ffb2e1",
+                    "mixHash" : "0xf4feead76b22c595d9c7d3c54ad511cac0b0136d721334fa29722c1453992903",
+                    "nonce" : "0xe4064acf39b08f82",
                     "number" : "0x01",
                     "parentHash" : "0x76de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6",
                     "receiptTrie" : "0x1821d869b7e7de8f7cb25fd3abc8b949bd7f2dffeef110c06a15b80acdb6eaec",
@@ -235,7 +228,7 @@
                     "transactionsTrie" : "0x4f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f7a076de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f1a7844373e7b09b53f335f8b03a9a7cedeaf97e36c227d3b32b8439800d2881a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a01821d869b7e7de8f7cb25fd3abc8b949bd7f2dffeef110c06a15b80acdb6eaecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082358f8203e880a0ca29b649bf42b58c8fbe29486c34f3e96f1b2d6bf9008cf2077f8806ea2d4bfe88e4f2d1d2344c0b0ef866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
+                "rlp" : "0xf90263f901f7a076de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f1a7844373e7b09b53f335f8b03a9a7cedeaf97e36c227d3b32b8439800d2881a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a01821d869b7e7de8f7cb25fd3abc8b949bd7f2dffeef110c06a15b80acdb6eaecb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082358f8203e880a0f4feead76b22c595d9c7d3c54ad511cac0b0136d721334fa29722c145399290388e4064acf39b08f82f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -272,7 +265,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a38e179095b269154c1776ef395730c69e81ff6e8df7fb6b70abeaa7ccc0fec8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc612d4e2199906c35d36cde82b12d5e44a34d2d5d5817af1f36b7fb53209a314",
+        "lastblockhash" : "0x22af9868a9b85bf35bffea864dd8061cbfab2281696a2085d03dcfb7e2ffb2e1",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -310,7 +303,7 @@
     "refund_singleSuicide_d0g0v0_EIP158" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_singleSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -322,9 +315,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x35cb",
-                    "hash" : "0x06b30ae82bb91af1b4b7905d5873205ade546208113c36d0725c83970783a66a",
-                    "mixHash" : "0xb9c61e06e3e8532b6fc794fdb226cc83c4b31f9975d0848509c25dbe6d06e2ad",
-                    "nonce" : "0x9462b0705c459951",
+                    "hash" : "0x0af84476abdc65b5012004fe70174f9fb34e11011ae5432a367931af4f617c45",
+                    "mixHash" : "0xabc7013e4e11ddaf587eca61660af4f58f05a3822e499f94e8e59b553deb25ab",
+                    "nonce" : "0x966729f9538eaf03",
                     "number" : "0x01",
                     "parentHash" : "0x76de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6",
                     "receiptTrie" : "0xb6c21749c74666782f64e7b6e00d569d47da210542d3923dc12c2b151b165794",
@@ -333,7 +326,7 @@
                     "transactionsTrie" : "0x4f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f7a076de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f0de83259b3b8cb2a2ff8ed13ad54d2a7fda20fa09cba60dc95e4b2784df0bb8a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a0b6c21749c74666782f64e7b6e00d569d47da210542d3923dc12c2b151b165794b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408235cb8203e880a0b9c61e06e3e8532b6fc794fdb226cc83c4b31f9975d0848509c25dbe6d06e2ad889462b0705c459951f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
+                "rlp" : "0xf90263f901f7a076de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f0de83259b3b8cb2a2ff8ed13ad54d2a7fda20fa09cba60dc95e4b2784df0bb8a04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a0b6c21749c74666782f64e7b6e00d569d47da210542d3923dc12c2b151b165794b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408235cb8203e880a0abc7013e4e11ddaf587eca61660af4f58f05a3822e499f94e8e59b553deb25ab88966729f9538eaf03f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -370,7 +363,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a38e179095b269154c1776ef395730c69e81ff6e8df7fb6b70abeaa7ccc0fec8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x06b30ae82bb91af1b4b7905d5873205ade546208113c36d0725c83970783a66a",
+        "lastblockhash" : "0x0af84476abdc65b5012004fe70174f9fb34e11011ae5432a367931af4f617c45",
         "network" : "EIP158",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -408,7 +401,7 @@
     "refund_singleSuicide_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_singleSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -420,9 +413,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x2a81",
-                    "hash" : "0x4d75c09bf8c3d88eeafbcabc2ae9b97e9870bc7ced081fb4942e395b02888620",
-                    "mixHash" : "0x0d0817193509451e873a551056dd689f5e2a66281c8c6dc9db2609ae0d523e10",
-                    "nonce" : "0x0029b533135f3474",
+                    "hash" : "0xaf990cb67f3f51d814cca13893663da08f3e3590fc74c3c4e1d2f2a8eccb100b",
+                    "mixHash" : "0x952514e43b300185d05b5c44a32217713256656da2adb72a0113e87e5dfb99a4",
+                    "nonce" : "0x7c4676007eebadac",
                     "number" : "0x01",
                     "parentHash" : "0x76de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6",
                     "receiptTrie" : "0x2ef05f56cb6db36f6426768e02e4ed9812880858d64f471899b0308b2147ae57",
@@ -431,7 +424,7 @@
                     "transactionsTrie" : "0x4f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f7a076de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06120595fc89b40c3c2fadcf63058de93cbd83dca0fbc053bf1b8137d84ec932fa04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a02ef05f56cb6db36f6426768e02e4ed9812880858d64f471899b0308b2147ae57b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240822a818203e880a00d0817193509451e873a551056dd689f5e2a66281c8c6dc9db2609ae0d523e10880029b533135f3474f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
+                "rlp" : "0xf90263f901f7a076de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06120595fc89b40c3c2fadcf63058de93cbd83dca0fbc053bf1b8137d84ec932fa04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a02ef05f56cb6db36f6426768e02e4ed9812880858d64f471899b0308b2147ae57b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240822a818203e880a0952514e43b300185d05b5c44a32217713256656da2adb72a0113e87e5dfb99a4887c4676007eebadacf866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -468,7 +461,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a38e179095b269154c1776ef395730c69e81ff6e8df7fb6b70abeaa7ccc0fec8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4d75c09bf8c3d88eeafbcabc2ae9b97e9870bc7ced081fb4942e395b02888620",
+        "lastblockhash" : "0xaf990cb67f3f51d814cca13893663da08f3e3590fc74c3c4e1d2f2a8eccb100b",
         "network" : "Frontier",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -506,7 +499,7 @@
     "refund_singleSuicide_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.e0f7b68a.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.7b8143d3.Linux.g++",
             "source" : "/src/GenStateTestAsBcTemp/stRefundTest/refund_singleSuicide_d0g0v0Filler.json"
         },
         "blocks" : [
@@ -518,9 +511,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x2a81",
-                    "hash" : "0x02a73207447b42e3b979e5f91f3f32cdd7b1017900f5b5e71bd258c046db73f4",
-                    "mixHash" : "0x957a459d753965b6e7cb1bc462981cfb947d0f6b75c4fe12657f4b8b4374174f",
-                    "nonce" : "0xb2ae88336104e297",
+                    "hash" : "0x4e2d6308ebbfc0d4d34bcb79be3475bc17aab053384657247192097e052f1f2f",
+                    "mixHash" : "0xd93bc8ebf6bede79a64679f218960c4a1a6b9003f1f5edea1edb0cc4126cc362",
+                    "nonce" : "0x9836d33dd2078bd9",
                     "number" : "0x01",
                     "parentHash" : "0x76de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6",
                     "receiptTrie" : "0x2ef05f56cb6db36f6426768e02e4ed9812880858d64f471899b0308b2147ae57",
@@ -529,7 +522,7 @@
                     "transactionsTrie" : "0x4f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f7a076de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06120595fc89b40c3c2fadcf63058de93cbd83dca0fbc053bf1b8137d84ec932fa04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a02ef05f56cb6db36f6426768e02e4ed9812880858d64f471899b0308b2147ae57b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240822a818203e880a0957a459d753965b6e7cb1bc462981cfb947d0f6b75c4fe12657f4b8b4374174f88b2ae88336104e297f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
+                "rlp" : "0xf90263f901f7a076de4e53b4b1fa28d1ad390fca28de6197f31d81d8464b2d9dfc9a06e36a2df6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06120595fc89b40c3c2fadcf63058de93cbd83dca0fbc053bf1b8137d84ec932fa04f1914c634a076b49e3ed15bd3dea65f200e5325bad014d9ac1fd1d355777c10a02ef05f56cb6db36f6426768e02e4ed9812880858d64f471899b0308b2147ae57b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240822a818203e880a0d93bc8ebf6bede79a64679f218960c4a1a6b9003f1f5edea1edb0cc4126cc362889836d33dd2078bd9f866f8648001830493e09410000000000000000000000000000000000000018084c04062261ba06c7a67f0afeb37026a7b6d1e029cb15887fed2b363cd5ee95c56a6cb1ae1f525a02fea0a6c8ddf75b659dedafa27f2e5854537b18b77e219352ec0079b678ab40fc0",
                 "transactions" : [
                     {
                         "data" : "0xc0406226",
@@ -566,7 +559,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a38e179095b269154c1776ef395730c69e81ff6e8df7fb6b70abeaa7ccc0fec8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x02a73207447b42e3b979e5f91f3f32cdd7b1017900f5b5e71bd258c046db73f4",
+        "lastblockhash" : "0x4e2d6308ebbfc0d4d34bcb79be3475bc17aab053384657247192097e052f1f2f",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {