31 files changed, 10289 insertions, 4592 deletions
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow_d0g0v0.json
index a8d413525..4348df8f8 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "Call1024BalanceTooLow_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/Call1024BalanceTooLow_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x0117bce4",
-                    "hash" : "bc836bcacf1b909b9c26c8eaa625210f1231b37b20e7a2d11d6a13ae9af60d15",
-                    "mixHash" : "77b30caba9eb55dc596ac40a64dd7e09fa68f8bf6df7d32f87774e9354ac5ae3",
-                    "nonce" : "e1b01f9afd1cf60e",
+                    "hash" : "0x833da4aeb3b117a4fdbcb687a64a05604e6f45238780d50c6001560526ce0101",
+                    "mixHash" : "0x3d377b305362813a861f2921800cdafbf409a0ea6ba222041540903c88fa59f6",
+                    "nonce" : "0x805b7914dd9cea78",
                     "number" : "0x01",
-                    "parentHash" : "355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50",
-                    "receiptTrie" : "e21c435f977dd4904bdc2e5edbb1ba756222f6e4602493e1fed0a906395bf433",
-                    "stateRoot" : "0ddd821794b0d44365cc798e1415ab64306f9ae5c2c9be157f26de4642f359d0",
+                    "parentHash" : "0x355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50",
+                    "receiptTrie" : "0xe21c435f977dd4904bdc2e5edbb1ba756222f6e4602493e1fed0a906395bf433",
+                    "stateRoot" : "0x0ddd821794b0d44365cc798e1415ab64306f9ae5c2c9be157f26de4642f359d0",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90269f901fea0355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ddd821794b0d44365cc798e1415ab64306f9ae5c2c9be157f26de4642f359d0a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a0e21c435f977dd4904bdc2e5edbb1ba756222f6e4602493e1fed0a906395bf433b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a077b30caba9eb55dc596ac40a64dd7e09fa68f8bf6df7d32f87774e9354ac5ae388e1b01f9afd1cf60ef865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf90269f901fea0355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ddd821794b0d44365cc798e1415ab64306f9ae5c2c9be157f26de4642f359d0a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a0e21c435f977dd4904bdc2e5edbb1ba756222f6e4602493e1fed0a906395bf433b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a03d377b305362813a861f2921800cdafbf409a0ea6ba222041540903c88fa59f688805b7914dd9cea78f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x10000000d788",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x5e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5",
                         "s" : "0x494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57a",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -39,49 +44,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "7c09a14728cbaf6f1bc7febd3bc016c87166727ecf78fb9ee35d6e15e4b79f44",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7c09a14728cbaf6f1bc7febd3bc016c87166727ecf78fb9ee35d6e15e4b79f44",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c09a14728cbaf6f1bc7febd3bc016c87166727ecf78fb9ee35d6e15e4b79f44a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "bc836bcacf1b909b9c26c8eaa625210f1231b37b20e7a2d11d6a13ae9af60d15",
+        "lastblockhash" : "0x833da4aeb3b117a4fdbcb687a64a05604e6f45238780d50c6001560526ce0101",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x45639182460bbce4",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xfffffffffffffffffffffffffee84311",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
                 "nonce" : "0x00",
@@ -92,21 +97,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
                 "nonce" : "0x00",
@@ -116,36 +121,41 @@
         }
     },
     "Call1024BalanceTooLow_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/Call1024BalanceTooLow_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x0117bce4",
-                    "hash" : "67df05e43d1b4e63cee68e298a9222b54d22ff69488ad78be5e7b2af25dce9e5",
-                    "mixHash" : "06e388a67b279c326d27acbda060df5cb24b8c603cba1a233d25e52d6dcbc8f2",
-                    "nonce" : "c8a64a7e19bea655",
+                    "hash" : "0x33de1977a368689803d8e8515a7f252e176797db2a6966027c3e5524b1113d36",
+                    "mixHash" : "0xaf31cabbe57ec038856d14a3750bd82638532abf48ba33cb12c15906aae5449d",
+                    "nonce" : "0x889009df90f1d0e4",
                     "number" : "0x01",
-                    "parentHash" : "355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50",
-                    "receiptTrie" : "e21c435f977dd4904bdc2e5edbb1ba756222f6e4602493e1fed0a906395bf433",
-                    "stateRoot" : "0ddd821794b0d44365cc798e1415ab64306f9ae5c2c9be157f26de4642f359d0",
+                    "parentHash" : "0x355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50",
+                    "receiptTrie" : "0xe21c435f977dd4904bdc2e5edbb1ba756222f6e4602493e1fed0a906395bf433",
+                    "stateRoot" : "0x0ddd821794b0d44365cc798e1415ab64306f9ae5c2c9be157f26de4642f359d0",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90269f901fea0355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ddd821794b0d44365cc798e1415ab64306f9ae5c2c9be157f26de4642f359d0a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a0e21c435f977dd4904bdc2e5edbb1ba756222f6e4602493e1fed0a906395bf433b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a006e388a67b279c326d27acbda060df5cb24b8c603cba1a233d25e52d6dcbc8f288c8a64a7e19bea655f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf90269f901fea0355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ddd821794b0d44365cc798e1415ab64306f9ae5c2c9be157f26de4642f359d0a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a0e21c435f977dd4904bdc2e5edbb1ba756222f6e4602493e1fed0a906395bf433b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a0af31cabbe57ec038856d14a3750bd82638532abf48ba33cb12c15906aae5449d88889009df90f1d0e4f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x10000000d788",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x5e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5",
                         "s" : "0x494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57a",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -155,49 +165,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "7c09a14728cbaf6f1bc7febd3bc016c87166727ecf78fb9ee35d6e15e4b79f44",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7c09a14728cbaf6f1bc7febd3bc016c87166727ecf78fb9ee35d6e15e4b79f44",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c09a14728cbaf6f1bc7febd3bc016c87166727ecf78fb9ee35d6e15e4b79f44a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "67df05e43d1b4e63cee68e298a9222b54d22ff69488ad78be5e7b2af25dce9e5",
+        "lastblockhash" : "0x33de1977a368689803d8e8515a7f252e176797db2a6966027c3e5524b1113d36",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x45639182460bbce4",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xfffffffffffffffffffffffffee84311",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
                 "nonce" : "0x00",
@@ -208,21 +218,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
                 "nonce" : "0x00",
@@ -232,36 +242,41 @@
         }
     },
     "Call1024BalanceTooLow_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/Call1024BalanceTooLow_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x10000000d787",
-                    "hash" : "a0bc8a396ef478b0a0bcfc80bcb49dcc065b09db14248dc4b599088583a298a5",
-                    "mixHash" : "af45387419711b6feb62dc8f90e130553a3f10cf4e58e95ae0af376659809bef",
-                    "nonce" : "22006b10f93302f9",
+                    "hash" : "0xa975fca9dac8ee87b811f1ddbdf51e6d5f06db9b544f2010c633c709ebede970",
+                    "mixHash" : "0x6f4818cfae1792d82df2e709717ffd9e7d11ff8bce051a22dd5d45112a0d9e47",
+                    "nonce" : "0x8e3788733c3628e3",
                     "number" : "0x01",
-                    "parentHash" : "355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50",
-                    "receiptTrie" : "f3ab4ebf649ce7b5dcc5da0237f018289850a40c106955ac4eca282cdefaf7f2",
-                    "stateRoot" : "47b404765b62a3544b61f6af7af55d485db6f5b9e265ded4481e19069887b7ad",
+                    "parentHash" : "0x355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50",
+                    "receiptTrie" : "0xf3ab4ebf649ce7b5dcc5da0237f018289850a40c106955ac4eca282cdefaf7f2",
+                    "stateRoot" : "0x47b404765b62a3544b61f6af7af55d485db6f5b9e265ded4481e19069887b7ad",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf90200a0355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa047b404765b62a3544b61f6af7af55d485db6f5b9e265ded4481e19069887b7ada025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a0f3ab4ebf649ce7b5dcc5da0237f018289850a40c106955ac4eca282cdefaf7f2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7878203e880a0af45387419711b6feb62dc8f90e130553a3f10cf4e58e95ae0af376659809bef8822006b10f93302f9f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf9026bf90200a0355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa047b404765b62a3544b61f6af7af55d485db6f5b9e265ded4481e19069887b7ada025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a0f3ab4ebf649ce7b5dcc5da0237f018289850a40c106955ac4eca282cdefaf7f2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7878203e880a06f4818cfae1792d82df2e709717ffd9e7d11ff8bce051a22dd5d45112a0d9e47888e3788733c3628e3f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x10000000d788",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x5e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5",
                         "s" : "0x494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57a",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -271,49 +286,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "7c09a14728cbaf6f1bc7febd3bc016c87166727ecf78fb9ee35d6e15e4b79f44",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7c09a14728cbaf6f1bc7febd3bc016c87166727ecf78fb9ee35d6e15e4b79f44",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c09a14728cbaf6f1bc7febd3bc016c87166727ecf78fb9ee35d6e15e4b79f44a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "a0bc8a396ef478b0a0bcfc80bcb49dcc065b09db14248dc4b599088583a298a5",
+        "lastblockhash" : "0xa975fca9dac8ee87b811f1ddbdf51e6d5f06db9b544f2010c633c709ebede970",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563a18244f4d787",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffefffffff286e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
                 "nonce" : "0x00",
@@ -323,21 +338,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
                 "nonce" : "0x00",
@@ -347,36 +362,41 @@
         }
     },
     "Call1024BalanceTooLow_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/Call1024BalanceTooLow_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x10000000d787",
-                    "hash" : "56d27f8bd475b4ce58344b763a0b5343cf869090c0949dcd28a1943ce443625a",
-                    "mixHash" : "531a9a984915461480edaf2ed0ca2d63423850d3c2841d3393beb1a1f24b8867",
-                    "nonce" : "453c132cc8adf65d",
+                    "hash" : "0xfa729ead04c3d3afdcdf1066796aa5112ce1a7239100af8f75c320cd91bd1f0f",
+                    "mixHash" : "0x9f56216686a70683b9e06f21b3a539472b66fd08475210543a762ced15b0bc91",
+                    "nonce" : "0xe196af607fb23495",
                     "number" : "0x01",
-                    "parentHash" : "355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50",
-                    "receiptTrie" : "f3ab4ebf649ce7b5dcc5da0237f018289850a40c106955ac4eca282cdefaf7f2",
-                    "stateRoot" : "47b404765b62a3544b61f6af7af55d485db6f5b9e265ded4481e19069887b7ad",
+                    "parentHash" : "0x355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50",
+                    "receiptTrie" : "0xf3ab4ebf649ce7b5dcc5da0237f018289850a40c106955ac4eca282cdefaf7f2",
+                    "stateRoot" : "0x47b404765b62a3544b61f6af7af55d485db6f5b9e265ded4481e19069887b7ad",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf90200a0355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa047b404765b62a3544b61f6af7af55d485db6f5b9e265ded4481e19069887b7ada025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a0f3ab4ebf649ce7b5dcc5da0237f018289850a40c106955ac4eca282cdefaf7f2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7878203e880a0531a9a984915461480edaf2ed0ca2d63423850d3c2841d3393beb1a1f24b886788453c132cc8adf65df865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf9026bf90200a0355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa047b404765b62a3544b61f6af7af55d485db6f5b9e265ded4481e19069887b7ada025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a0f3ab4ebf649ce7b5dcc5da0237f018289850a40c106955ac4eca282cdefaf7f2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7878203e880a09f56216686a70683b9e06f21b3a539472b66fd08475210543a762ced15b0bc9188e196af607fb23495f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x10000000d788",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x5e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5",
                         "s" : "0x494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57a",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -386,49 +406,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "7c09a14728cbaf6f1bc7febd3bc016c87166727ecf78fb9ee35d6e15e4b79f44",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7c09a14728cbaf6f1bc7febd3bc016c87166727ecf78fb9ee35d6e15e4b79f44",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c09a14728cbaf6f1bc7febd3bc016c87166727ecf78fb9ee35d6e15e4b79f44a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "56d27f8bd475b4ce58344b763a0b5343cf869090c0949dcd28a1943ce443625a",
+        "lastblockhash" : "0xfa729ead04c3d3afdcdf1066796aa5112ce1a7239100af8f75c320cd91bd1f0f",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563a18244f4d787",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffefffffff286e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
                 "nonce" : "0x00",
@@ -438,21 +458,149 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0400",
+                "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "Call1024BalanceTooLow_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/Call1024BalanceTooLow_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x0117bce4",
+                    "hash" : "0x983c429fa1501b32d7724ea8aa0c5bd83f04feda935643c47218f76508c2e1ca",
+                    "mixHash" : "0x03ce1b7a33dd85850c2cd3a4faea9e5086e3af0d71504b53f44e9c95de2b723a",
+                    "nonce" : "0xd987332f27f9dd6c",
+                    "number" : "0x01",
+                    "parentHash" : "0x355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50",
+                    "receiptTrie" : "0x3916ef002c14f35e24fbec7580b490cc1be018bf8705486ce2c1f5ed5e11548b",
+                    "stateRoot" : "0xe27f7a183ad81c7ae0b1a32ac92af790fadf429b311701944616502ddb945175",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90269f901fea0355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e27f7a183ad81c7ae0b1a32ac92af790fadf429b311701944616502ddb945175a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a03916ef002c14f35e24fbec7580b490cc1be018bf8705486ce2c1f5ed5e11548bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a003ce1b7a33dd85850c2cd3a4faea9e5086e3af0d71504b53f44e9c95de2b723a88d987332f27f9dd6cf865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x10000000d788",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x5e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5",
+                        "s" : "0x494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57a",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0x355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x7c09a14728cbaf6f1bc7febd3bc016c87166727ecf78fb9ee35d6e15e4b79f44",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c09a14728cbaf6f1bc7febd3bc016c87166727ecf78fb9ee35d6e15e4b79f44a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x983c429fa1501b32d7724ea8aa0c5bd83f04feda935643c47218f76508c2e1ca",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x45639182460bbce4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xfffffffffffffffffffffffffee84311",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x040a",
+                "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x0401",
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
                 "nonce" : "0x00",
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/Call1024PreCalls.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/Call1024PreCalls_d0g0v0.json
index ff7868e12..e7d88bab4 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/Call1024PreCalls.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/Call1024PreCalls_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "Call1024PreCalls_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/Call1024PreCalls_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x022d84a6",
-                    "hash" : "f9d20e5bfb5b5a3967e3a635107823b203cd6eb088436dcd50a6d6d1b3c77a1c",
-                    "mixHash" : "066d686d65b30e31e6f2ae0c69d64c35420d57933132b6a5dde579f365f50a76",
-                    "nonce" : "bb1053e1b7c23abe",
+                    "hash" : "0x32be6ba61d6cfa14330e3c4f0a1fc4a53756c2a6dfdecbf2aaabd17aeecc2cfc",
+                    "mixHash" : "0x1b0c3472e6cfbf535681ac5a63fee9b4b289ce5183ce9806364e3961ebeebb4d",
+                    "nonce" : "0x9a6f37e698abb537",
                     "number" : "0x01",
-                    "parentHash" : "c5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fc",
-                    "receiptTrie" : "9135d290612e7e9510fea75885b2d269ba76eab063ad93ab228de0b3859c4299",
-                    "stateRoot" : "396e72db9599f9db815254cdea5ecdb1cfffb5012abb84467492a0dcd5e1e158",
+                    "parentHash" : "0xc5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fc",
+                    "receiptTrie" : "0x9135d290612e7e9510fea75885b2d269ba76eab063ad93ab228de0b3859c4299",
+                    "stateRoot" : "0x396e72db9599f9db815254cdea5ecdb1cfffb5012abb84467492a0dcd5e1e158",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf901fea0c5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0396e72db9599f9db815254cdea5ecdb1cfffb5012abb84467492a0dcd5e1e158a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa09135d290612e7e9510fea75885b2d269ba76eab063ad93ab228de0b3859c4299b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d84a68203e880a0066d686d65b30e31e6f2ae0c69d64c35420d57933132b6a5dde579f365f50a7688bb1053e1b7c23abef867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026bf901fea0c5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0396e72db9599f9db815254cdea5ecdb1cfffb5012abb84467492a0dcd5e1e158a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa09135d290612e7e9510fea75885b2d269ba76eab063ad93ab228de0b3859c4299b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d84a68203e880a01b0c3472e6cfbf535681ac5a63fee9b4b289ce5183ce9806364e3961ebeebb4d889a6f37e698abb537f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
                         "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -39,49 +44,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "c5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fc",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fc",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "eefba8e6201d499f56046a96cf9d2b8be216f1ea6ccf6b3d53534527856e9015",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xeefba8e6201d499f56046a96cf9d2b8be216f1ea6ccf6b3d53534527856e9015",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eefba8e6201d499f56046a96cf9d2b8be216f1ea6ccf6b3d53534527856e9015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f9d20e5bfb5b5a3967e3a635107823b203cd6eb088436dcd50a6d6d1b3c77a1c",
+        "lastblockhash" : "0x32be6ba61d6cfa14330e3c4f0a1fc4a53756c2a6dfdecbf2aaabd17aeecc2cfc",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x45639182472184a6",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0ffffffffffffffffffffffffffdd27b4f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2320",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2a",
                 "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16003556001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
                 "nonce" : "0x00",
@@ -94,21 +99,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07e8",
                 "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16003556001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
                 "nonce" : "0x00",
@@ -118,36 +123,41 @@
         }
     },
     "Call1024PreCalls_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/Call1024PreCalls_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x022d84a6",
-                    "hash" : "f2c6af2e36545b732c68324c5e0cd6754aa201c93c5cbbe0ff7c7cc614ef4918",
-                    "mixHash" : "774015c9085728b5ccb355ff0491c5240488f3faddf0e362aaaab24f61396c2b",
-                    "nonce" : "7e36f476a1d1b947",
+                    "hash" : "0x28af8fbcdcce5235de5e78804248ef22f0fea318bcef2ca437338a7f7ea5c4fe",
+                    "mixHash" : "0xb3b3206ae299985df9902b5b604543b75829fe8283675c911aa3acdaa3871754",
+                    "nonce" : "0x66213157c17fdf43",
                     "number" : "0x01",
-                    "parentHash" : "c5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fc",
-                    "receiptTrie" : "9135d290612e7e9510fea75885b2d269ba76eab063ad93ab228de0b3859c4299",
-                    "stateRoot" : "396e72db9599f9db815254cdea5ecdb1cfffb5012abb84467492a0dcd5e1e158",
+                    "parentHash" : "0xc5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fc",
+                    "receiptTrie" : "0x9135d290612e7e9510fea75885b2d269ba76eab063ad93ab228de0b3859c4299",
+                    "stateRoot" : "0x396e72db9599f9db815254cdea5ecdb1cfffb5012abb84467492a0dcd5e1e158",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf901fea0c5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0396e72db9599f9db815254cdea5ecdb1cfffb5012abb84467492a0dcd5e1e158a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa09135d290612e7e9510fea75885b2d269ba76eab063ad93ab228de0b3859c4299b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d84a68203e880a0774015c9085728b5ccb355ff0491c5240488f3faddf0e362aaaab24f61396c2b887e36f476a1d1b947f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026bf901fea0c5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0396e72db9599f9db815254cdea5ecdb1cfffb5012abb84467492a0dcd5e1e158a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa09135d290612e7e9510fea75885b2d269ba76eab063ad93ab228de0b3859c4299b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d84a68203e880a0b3b3206ae299985df9902b5b604543b75829fe8283675c911aa3acdaa38717548866213157c17fdf43f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
                         "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -157,49 +167,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "c5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fc",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fc",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "eefba8e6201d499f56046a96cf9d2b8be216f1ea6ccf6b3d53534527856e9015",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xeefba8e6201d499f56046a96cf9d2b8be216f1ea6ccf6b3d53534527856e9015",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eefba8e6201d499f56046a96cf9d2b8be216f1ea6ccf6b3d53534527856e9015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f2c6af2e36545b732c68324c5e0cd6754aa201c93c5cbbe0ff7c7cc614ef4918",
+        "lastblockhash" : "0x28af8fbcdcce5235de5e78804248ef22f0fea318bcef2ca437338a7f7ea5c4fe",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x45639182472184a6",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0ffffffffffffffffffffffffffdd27b4f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2320",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x2a",
                 "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16003556001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
                 "nonce" : "0x00",
@@ -212,21 +222,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07e8",
                 "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16003556001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
                 "nonce" : "0x00",
@@ -236,36 +246,41 @@
         }
     },
     "Call1024PreCalls_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/Call1024PreCalls_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x100000018545",
-                    "hash" : "753c607efac48beb3b5a48b981bd023fdcb161bce1b5da0bae2fdbe13c12aefb",
-                    "mixHash" : "060bc5c5faa64d7df7c6991663a911746606cbedd219f3a553e48500893c7730",
-                    "nonce" : "e67e8253c8c4c231",
+                    "hash" : "0x1cd24e1a853f4ae65822e09fb348e2ea7b32c9d76f84bd3c7ee33f98fbe1b490",
+                    "mixHash" : "0x611d46de386cfad176ee5ee1f689530da28b59725cc8ba9e4191b73f1d3d7f3a",
+                    "nonce" : "0xd6eae2047e9181f5",
                     "number" : "0x01",
-                    "parentHash" : "c5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fc",
-                    "receiptTrie" : "d0a86dd369ddb39fb029cf61234871f34c1d430fb2eb483847e2998c7f8dd208",
-                    "stateRoot" : "25c2221b99164b8d7919abaea8390a32e0d6665d32876fd93921c034956aed4e",
+                    "parentHash" : "0xc5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fc",
+                    "receiptTrie" : "0xd0a86dd369ddb39fb029cf61234871f34c1d430fb2eb483847e2998c7f8dd208",
+                    "stateRoot" : "0x25c2221b99164b8d7919abaea8390a32e0d6665d32876fd93921c034956aed4e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026df90200a0c5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025c2221b99164b8d7919abaea8390a32e0d6665d32876fd93921c034956aed4ea05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0d0a86dd369ddb39fb029cf61234871f34c1d430fb2eb483847e2998c7f8dd208b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff861000000185458203e880a0060bc5c5faa64d7df7c6991663a911746606cbedd219f3a553e48500893c773088e67e8253c8c4c231f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026df90200a0c5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025c2221b99164b8d7919abaea8390a32e0d6665d32876fd93921c034956aed4ea05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0d0a86dd369ddb39fb029cf61234871f34c1d430fb2eb483847e2998c7f8dd208b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff861000000185458203e880a0611d46de386cfad176ee5ee1f689530da28b59725cc8ba9e4191b73f1d3d7f3a88d6eae2047e9181f5f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
                         "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -275,49 +290,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "c5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fc",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fc",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "eefba8e6201d499f56046a96cf9d2b8be216f1ea6ccf6b3d53534527856e9015",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xeefba8e6201d499f56046a96cf9d2b8be216f1ea6ccf6b3d53534527856e9015",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eefba8e6201d499f56046a96cf9d2b8be216f1ea6ccf6b3d53534527856e9015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "753c607efac48beb3b5a48b981bd023fdcb161bce1b5da0bae2fdbe13c12aefb",
+        "lastblockhash" : "0x1cd24e1a853f4ae65822e09fb348e2ea7b32c9d76f84bd3c7ee33f98fbe1b490",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563a18244f58545",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffffffffeffffffe7ab0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b5a",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07f0",
                 "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16003556001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
                 "nonce" : "0x00",
@@ -329,21 +344,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07e8",
                 "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16003556001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
                 "nonce" : "0x00",
@@ -353,36 +368,41 @@
         }
     },
     "Call1024PreCalls_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/Call1024PreCalls_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x100000018545",
-                    "hash" : "7d997d603b3c184dba7b7be344ffa161cedb56e40194e27ec6bc02aa7376432e",
-                    "mixHash" : "961b4e8f794eedcabf29fc14e178f8b9af3a5015cf7bfbc6cbf1673d69d0b0c9",
-                    "nonce" : "fbd8b087fa8a1d2c",
+                    "hash" : "0x64760b693bb5bb47f65ddb3ae96aa3aa9601a7adfa79e6aa5aa2f0c279cc967e",
+                    "mixHash" : "0x604629d75e0d324693193a55ad0d8534528fc54751bd1fb8c60ea6cb184ba532",
+                    "nonce" : "0x29355986175171eb",
                     "number" : "0x01",
-                    "parentHash" : "c5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fc",
-                    "receiptTrie" : "d0a86dd369ddb39fb029cf61234871f34c1d430fb2eb483847e2998c7f8dd208",
-                    "stateRoot" : "25c2221b99164b8d7919abaea8390a32e0d6665d32876fd93921c034956aed4e",
+                    "parentHash" : "0xc5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fc",
+                    "receiptTrie" : "0xd0a86dd369ddb39fb029cf61234871f34c1d430fb2eb483847e2998c7f8dd208",
+                    "stateRoot" : "0x25c2221b99164b8d7919abaea8390a32e0d6665d32876fd93921c034956aed4e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026df90200a0c5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025c2221b99164b8d7919abaea8390a32e0d6665d32876fd93921c034956aed4ea05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0d0a86dd369ddb39fb029cf61234871f34c1d430fb2eb483847e2998c7f8dd208b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff861000000185458203e880a0961b4e8f794eedcabf29fc14e178f8b9af3a5015cf7bfbc6cbf1673d69d0b0c988fbd8b087fa8a1d2cf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026df90200a0c5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025c2221b99164b8d7919abaea8390a32e0d6665d32876fd93921c034956aed4ea05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0d0a86dd369ddb39fb029cf61234871f34c1d430fb2eb483847e2998c7f8dd208b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff861000000185458203e880a0604629d75e0d324693193a55ad0d8534528fc54751bd1fb8c60ea6cb184ba5328829355986175171ebf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
                         "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -392,49 +412,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "c5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fc",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fc",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "eefba8e6201d499f56046a96cf9d2b8be216f1ea6ccf6b3d53534527856e9015",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xeefba8e6201d499f56046a96cf9d2b8be216f1ea6ccf6b3d53534527856e9015",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eefba8e6201d499f56046a96cf9d2b8be216f1ea6ccf6b3d53534527856e9015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "7d997d603b3c184dba7b7be344ffa161cedb56e40194e27ec6bc02aa7376432e",
+        "lastblockhash" : "0x64760b693bb5bb47f65ddb3ae96aa3aa9601a7adfa79e6aa5aa2f0c279cc967e",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563a18244f58545",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffffffffeffffffe7ab0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b5a",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07f0",
                 "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16003556001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
                 "nonce" : "0x00",
@@ -446,21 +466,151 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0fffffffffffffffffffffffffffffffff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x07e8",
+                "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16003556001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "Call1024PreCalls_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/Call1024PreCalls_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x022d84a6",
+                    "hash" : "0x6a772fbda1cc2a20d84cd395ba6b3ac4fb36d525958c4d9d10c7e42db8f99e0a",
+                    "mixHash" : "0x1eafe15cb79eb722fbfbe4a6ccb2843920cb1e5a078863064bb99a8f8063a823",
+                    "nonce" : "0xaff663863f1c6858",
+                    "number" : "0x01",
+                    "parentHash" : "0xc5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fc",
+                    "receiptTrie" : "0x47e523f247c7f04664ca01c908f7ffb27e27a8e456da67781db73f57db2d9e3a",
+                    "stateRoot" : "0x31725ee7fef8cb8b938294582c409360a92042e5c3aaeef8741513567d4a3188",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9026bf901fea0c5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa031725ee7fef8cb8b938294582c409360a92042e5c3aaeef8741513567d4a3188a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa047e523f247c7f04664ca01c908f7ffb27e27a8e456da67781db73f57db2d9e3ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d84a68203e880a01eafe15cb79eb722fbfbe4a6ccb2843920cb1e5a078863064bb99a8f8063a82388aff663863f1c6858f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x7ffffffffffffff0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
+                        "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0xc5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fc",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xeefba8e6201d499f56046a96cf9d2b8be216f1ea6ccf6b3d53534527856e9015",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eefba8e6201d499f56046a96cf9d2b8be216f1ea6ccf6b3d53534527856e9015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6a772fbda1cc2a20d84cd395ba6b3ac4fb36d525958c4d9d10c7e42db8f99e0a",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x45639182472184a6",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0ffffffffffffffffffffffffffdd27b4f",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2320",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x2a",
+                "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16003556001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x03e4",
+                    "0x01" : "0x01",
+                    "0x02" : "0x01",
+                    "0x03" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x07e8",
                 "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16003556001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
                 "nonce" : "0x00",
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow_d0g0v0.json
index 3246f5a2b..e6167ec72 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "Callcode1024BalanceTooLow_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/Callcode1024BalanceTooLow_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x0117bce4",
-                    "hash" : "a18e72f00b4c315983eae3f836f9cd1da83466b9129c9729dc3e0ee4f35d6087",
-                    "mixHash" : "26036d458087be15dca3f5b8876e11e2414ef65f73e3f307843ec729cf81c25e",
-                    "nonce" : "1cb5a0f57bac0fcc",
+                    "hash" : "0xb9eec6246ebc0ac59f4a47bee5d9132c3bf7c2e0f6f6ff3c1c5a1f494a23563a",
+                    "mixHash" : "0x1cbac55a9df6eb482411572b36749ba727f829117583070e93b620032a13b677",
+                    "nonce" : "0x034692e741b78419",
                     "number" : "0x01",
-                    "parentHash" : "b3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bcea",
-                    "receiptTrie" : "49790fd18e7694030618faf1b6c312b91fd1428e180a2265746b8b21df8ce345",
-                    "stateRoot" : "82e7c5b4c2adf0b0d9de967171e7381025dca7b83ae55768b9d66d8d6bf74114",
+                    "parentHash" : "0xb3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bcea",
+                    "receiptTrie" : "0x49790fd18e7694030618faf1b6c312b91fd1428e180a2265746b8b21df8ce345",
+                    "stateRoot" : "0x82e7c5b4c2adf0b0d9de967171e7381025dca7b83ae55768b9d66d8d6bf74114",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf901fea0b3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bceaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082e7c5b4c2adf0b0d9de967171e7381025dca7b83ae55768b9d66d8d6bf74114a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa049790fd18e7694030618faf1b6c312b91fd1428e180a2265746b8b21df8ce345b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a026036d458087be15dca3f5b8876e11e2414ef65f73e3f307843ec729cf81c25e881cb5a0f57bac0fccf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026bf901fea0b3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bceaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082e7c5b4c2adf0b0d9de967171e7381025dca7b83ae55768b9d66d8d6bf74114a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa049790fd18e7694030618faf1b6c312b91fd1428e180a2265746b8b21df8ce345b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a01cbac55a9df6eb482411572b36749ba727f829117583070e93b620032a13b67788034692e741b78419f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
                         "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -39,49 +44,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "b3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bcea",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bcea",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "482bdc3fee00d6747e03877bbf2c19e5ddf26c72f366e831ca65b6d4ca2187bf",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x482bdc3fee00d6747e03877bbf2c19e5ddf26c72f366e831ca65b6d4ca2187bf",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0482bdc3fee00d6747e03877bbf2c19e5ddf26c72f366e831ca65b6d4ca2187bfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "a18e72f00b4c315983eae3f836f9cd1da83466b9129c9729dc3e0ee4f35d6087",
+        "lastblockhash" : "0xb9eec6246ebc0ac59f4a47bee5d9132c3bf7c2e0f6f6ff3c1c5a1f494a23563a",
         "network" : "EIP150",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x45639182460bbce4",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xfffffffffffffffffffffffffee84311",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff2600155",
                 "nonce" : "0x00",
@@ -92,21 +97,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff2600155",
                 "nonce" : "0x00",
@@ -116,36 +121,41 @@
         }
     },
     "Callcode1024BalanceTooLow_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/Callcode1024BalanceTooLow_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x0117bce4",
-                    "hash" : "4c13301adeedc81816e07a833d1b8f20086fdd590b3086d0ba1dd6c5c0f3d6ff",
-                    "mixHash" : "0ecadcd5976a24a283bea444fdd72d6a5885119bdc7311ce139b0f92efcca5de",
-                    "nonce" : "7c5b7a83bb838ab9",
+                    "hash" : "0xba6ed3ce7c8ce2878b6daa43971b3494d7b8bd42594b76e08592fe60a79e064e",
+                    "mixHash" : "0x6cf65353147b6bd3e286ddc0beb060dd49511f8940da67b58a0b70bf083b7f35",
+                    "nonce" : "0x890299f814a7165a",
                     "number" : "0x01",
-                    "parentHash" : "b3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bcea",
-                    "receiptTrie" : "49790fd18e7694030618faf1b6c312b91fd1428e180a2265746b8b21df8ce345",
-                    "stateRoot" : "82e7c5b4c2adf0b0d9de967171e7381025dca7b83ae55768b9d66d8d6bf74114",
+                    "parentHash" : "0xb3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bcea",
+                    "receiptTrie" : "0x49790fd18e7694030618faf1b6c312b91fd1428e180a2265746b8b21df8ce345",
+                    "stateRoot" : "0x82e7c5b4c2adf0b0d9de967171e7381025dca7b83ae55768b9d66d8d6bf74114",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf901fea0b3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bceaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082e7c5b4c2adf0b0d9de967171e7381025dca7b83ae55768b9d66d8d6bf74114a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa049790fd18e7694030618faf1b6c312b91fd1428e180a2265746b8b21df8ce345b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a00ecadcd5976a24a283bea444fdd72d6a5885119bdc7311ce139b0f92efcca5de887c5b7a83bb838ab9f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026bf901fea0b3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bceaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082e7c5b4c2adf0b0d9de967171e7381025dca7b83ae55768b9d66d8d6bf74114a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa049790fd18e7694030618faf1b6c312b91fd1428e180a2265746b8b21df8ce345b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a06cf65353147b6bd3e286ddc0beb060dd49511f8940da67b58a0b70bf083b7f3588890299f814a7165af867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
                         "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -155,49 +165,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "b3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bcea",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bcea",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "482bdc3fee00d6747e03877bbf2c19e5ddf26c72f366e831ca65b6d4ca2187bf",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x482bdc3fee00d6747e03877bbf2c19e5ddf26c72f366e831ca65b6d4ca2187bf",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0482bdc3fee00d6747e03877bbf2c19e5ddf26c72f366e831ca65b6d4ca2187bfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "4c13301adeedc81816e07a833d1b8f20086fdd590b3086d0ba1dd6c5c0f3d6ff",
+        "lastblockhash" : "0xba6ed3ce7c8ce2878b6daa43971b3494d7b8bd42594b76e08592fe60a79e064e",
         "network" : "EIP158",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x45639182460bbce4",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xfffffffffffffffffffffffffee84311",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff2600155",
                 "nonce" : "0x00",
@@ -208,21 +218,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff2600155",
                 "nonce" : "0x00",
@@ -232,36 +242,41 @@
         }
     },
     "Callcode1024BalanceTooLow_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/Callcode1024BalanceTooLow_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x10000000d787",
-                    "hash" : "5bc4d868d121d0fd28f55a3eab5cd8b3c64c6443307f58c1a2e2d164bd8aa82e",
-                    "mixHash" : "41167ea3344a659fda6711dd296b173ad7d77b99458667512e45932c0ff99153",
-                    "nonce" : "e91a5b3a3b432ce3",
+                    "hash" : "0xc4732187b7ff006dc3ecd5f7e5b889b9d52a2e472bced25ec39fa082b169cb58",
+                    "mixHash" : "0x124385aa54bbfb6c93fc74b45b20614f7b1e2ca0de6c4f509e39f4373f3bcda5",
+                    "nonce" : "0x81d46be5460e3084",
                     "number" : "0x01",
-                    "parentHash" : "b3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bcea",
-                    "receiptTrie" : "15122440f1756027edc1ae4a387ca9947cdaf5539eb2f05f5887215479a932e2",
-                    "stateRoot" : "acbbd40f8e0d6dee7ca8963df1133468cb31bd43e6cc10345a73891da97aef02",
+                    "parentHash" : "0xb3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bcea",
+                    "receiptTrie" : "0x15122440f1756027edc1ae4a387ca9947cdaf5539eb2f05f5887215479a932e2",
+                    "stateRoot" : "0xacbbd40f8e0d6dee7ca8963df1133468cb31bd43e6cc10345a73891da97aef02",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026df90200a0b3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bceaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0acbbd40f8e0d6dee7ca8963df1133468cb31bd43e6cc10345a73891da97aef02a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa015122440f1756027edc1ae4a387ca9947cdaf5539eb2f05f5887215479a932e2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7878203e880a041167ea3344a659fda6711dd296b173ad7d77b99458667512e45932c0ff9915388e91a5b3a3b432ce3f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026df90200a0b3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bceaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0acbbd40f8e0d6dee7ca8963df1133468cb31bd43e6cc10345a73891da97aef02a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa015122440f1756027edc1ae4a387ca9947cdaf5539eb2f05f5887215479a932e2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7878203e880a0124385aa54bbfb6c93fc74b45b20614f7b1e2ca0de6c4f509e39f4373f3bcda58881d46be5460e3084f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
                         "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -271,49 +286,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "b3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bcea",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bcea",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "482bdc3fee00d6747e03877bbf2c19e5ddf26c72f366e831ca65b6d4ca2187bf",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x482bdc3fee00d6747e03877bbf2c19e5ddf26c72f366e831ca65b6d4ca2187bf",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0482bdc3fee00d6747e03877bbf2c19e5ddf26c72f366e831ca65b6d4ca2187bfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "5bc4d868d121d0fd28f55a3eab5cd8b3c64c6443307f58c1a2e2d164bd8aa82e",
+        "lastblockhash" : "0xc4732187b7ff006dc3ecd5f7e5b889b9d52a2e472bced25ec39fa082b169cb58",
         "network" : "Frontier",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563a18244f4d787",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffefffffff286e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff2600155",
                 "nonce" : "0x00",
@@ -323,21 +338,21 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff2600155",
                 "nonce" : "0x00",
@@ -347,36 +362,41 @@
         }
     },
     "Callcode1024BalanceTooLow_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/Callcode1024BalanceTooLow_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x10000000d787",
-                    "hash" : "1b5a052790785164968bd3613d1398cd5423e3bdf2645e2925ad436182c5e292",
-                    "mixHash" : "b7e1d336cdc31d1423752d98d95931ecec263c575cc191676f9ccf743e02903a",
-                    "nonce" : "79963b5617b2914f",
+                    "hash" : "0x651625804c6abab9090e20ec6ef0daa567170be9d837b14d10cf51d365c48c61",
+                    "mixHash" : "0x97caebfcec6114fc369005170c1291ae7fe2df437955baf04bbbcc7b015a32eb",
+                    "nonce" : "0x57877b11dbfd7364",
                     "number" : "0x01",
-                    "parentHash" : "b3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bcea",
-                    "receiptTrie" : "15122440f1756027edc1ae4a387ca9947cdaf5539eb2f05f5887215479a932e2",
-                    "stateRoot" : "acbbd40f8e0d6dee7ca8963df1133468cb31bd43e6cc10345a73891da97aef02",
+                    "parentHash" : "0xb3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bcea",
+                    "receiptTrie" : "0x15122440f1756027edc1ae4a387ca9947cdaf5539eb2f05f5887215479a932e2",
+                    "stateRoot" : "0xacbbd40f8e0d6dee7ca8963df1133468cb31bd43e6cc10345a73891da97aef02",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026df90200a0b3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bceaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0acbbd40f8e0d6dee7ca8963df1133468cb31bd43e6cc10345a73891da97aef02a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa015122440f1756027edc1ae4a387ca9947cdaf5539eb2f05f5887215479a932e2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7878203e880a0b7e1d336cdc31d1423752d98d95931ecec263c575cc191676f9ccf743e02903a8879963b5617b2914ff867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026df90200a0b3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bceaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0acbbd40f8e0d6dee7ca8963df1133468cb31bd43e6cc10345a73891da97aef02a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa015122440f1756027edc1ae4a387ca9947cdaf5539eb2f05f5887215479a932e2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7878203e880a097caebfcec6114fc369005170c1291ae7fe2df437955baf04bbbcc7b015a32eb8857877b11dbfd7364f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
                         "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
                         "v" : "0x1c",
                         "value" : "0x0a"
                     }
@@ -386,49 +406,49 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x7fffffffffffffff",
             "gasUsed" : "0x00",
-            "hash" : "b3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bcea",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xb3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bcea",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "482bdc3fee00d6747e03877bbf2c19e5ddf26c72f366e831ca65b6d4ca2187bf",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x482bdc3fee00d6747e03877bbf2c19e5ddf26c72f366e831ca65b6d4ca2187bf",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0482bdc3fee00d6747e03877bbf2c19e5ddf26c72f366e831ca65b6d4ca2187bfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "1b5a052790785164968bd3613d1398cd5423e3bdf2645e2925ad436182c5e292",
+        "lastblockhash" : "0x651625804c6abab9090e20ec6ef0daa567170be9d837b14d10cf51d365c48c61",
         "network" : "Homestead",
         "postState" : {
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563a18244f4d787",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffefffffff286e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x040a",
                 "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff2600155",
                 "nonce" : "0x00",
@@ -438,21 +458,149 @@
             }
         },
         "pre" : {
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xffffffffffffffffffffffffffffffff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0400",
+                "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "Callcode1024BalanceTooLow_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/Callcode1024BalanceTooLow_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x7fffffffffffffff",
+                    "gasUsed" : "0x0117bce4",
+                    "hash" : "0xf61f051b7e495a4cee5fdbb7c597a7ab4e434bc68483c6ef218b11bb755e0714",
+                    "mixHash" : "0x84da895a793e16202cd99c4f2f481682a32880046b2f4519feb408cf895dd970",
+                    "nonce" : "0xfab4cc92174212e3",
+                    "number" : "0x01",
+                    "parentHash" : "0xb3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bcea",
+                    "receiptTrie" : "0x3916ef002c14f35e24fbec7580b490cc1be018bf8705486ce2c1f5ed5e11548b",
+                    "stateRoot" : "0x1b7e0c2c9b48103f4dc473f5ba9256186bde94598284dcd49e381cb40a789a50",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9026bf901fea0b3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bceaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b7e0c2c9b48103f4dc473f5ba9256186bde94598284dcd49e381cb40a789a50a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa03916ef002c14f35e24fbec7580b490cc1be018bf8705486ce2c1f5ed5e11548bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a084da895a793e16202cd99c4f2f481682a32880046b2f4519feb408cf895dd97088fab4cc92174212e3f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x7ffffffffffffff0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
+                        "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
+                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
+                        "v" : "0x1c",
+                        "value" : "0x0a"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x7fffffffffffffff",
+            "gasUsed" : "0x00",
+            "hash" : "0xb3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bcea",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x482bdc3fee00d6747e03877bbf2c19e5ddf26c72f366e831ca65b6d4ca2187bf",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0482bdc3fee00d6747e03877bbf2c19e5ddf26c72f366e831ca65b6d4ca2187bfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xf61f051b7e495a4cee5fdbb7c597a7ab4e434bc68483c6ef218b11bb755e0714",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x45639182460bbce4",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0xfffffffffffffffffffffffffee84311",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x1b58",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x040a",
+                "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff2600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x0401",
+                    "0x01" : "0x01"
+                }
+            }
+        },
+        "pre" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "aaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x1b58",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "bbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0400",
                 "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff2600155",
                 "nonce" : "0x00",
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1_d0g0v0.json
index 268c42c81..c6693be56 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcall_00_OOGE_1_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcall_00_OOGE_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x01c49f",
-                    "hash" : "bc36dc1fb4dedd72537520032cffb70b0f5f3c29c9bae925ca0c83c226c3345c",
-                    "mixHash" : "35e85117c5eadb25653417f3a052241242bfd75ee4c2c9b66aac2a54b36fd8a6",
-                    "nonce" : "87c8d24e8ad7f02f",
+                    "hash" : "0x1647dc2872bc9b05bab6a8687349f4e46231195b0189d8bebc02ba9e66fab043",
+                    "mixHash" : "0x6f0e56df11bf6be42f9d51d7f218470af50897271dfa0c0a4615fe08b6c68fe1",
+                    "nonce" : "0x75c73624c97c285c",
                     "number" : "0x01",
-                    "parentHash" : "ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
-                    "receiptTrie" : "e6aff110a7903b6979be95fb1a2bf7b209d4bf82f3b8ef9e87d7487f449e5f02",
-                    "stateRoot" : "9a2c583fb9edd66fc38f8bbef9ad68ab7aec0abd25906b550361dc296fd71162",
+                    "parentHash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
+                    "receiptTrie" : "0xe6aff110a7903b6979be95fb1a2bf7b209d4bf82f3b8ef9e87d7487f449e5f02",
+                    "stateRoot" : "0x9a2c583fb9edd66fc38f8bbef9ad68ab7aec0abd25906b550361dc296fd71162",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "31ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x31ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a2c583fb9edd66fc38f8bbef9ad68ab7aec0abd25906b550361dc296fd71162a031ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0a0e6aff110a7903b6979be95fb1a2bf7b209d4bf82f3b8ef9e87d7487f449e5f02b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301c49f8203e880a035e85117c5eadb25653417f3a052241242bfd75ee4c2c9b66aac2a54b36fd8a68887c8d24e8ad7f02ff862f86080018302bf6294100000000000000000000000000000000000000080801ba0f2904491d7d84ada0d1d94ee35aac71a0cb52ea2f8c16545f7493c14737ba15ca002f2ee18f95a17f1ba5ed106d78ae430d1fc3c5f88eb86cfbce90c9bc09b20c4c0",
+                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a2c583fb9edd66fc38f8bbef9ad68ab7aec0abd25906b550361dc296fd71162a031ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0a0e6aff110a7903b6979be95fb1a2bf7b209d4bf82f3b8ef9e87d7487f449e5f02b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301c49f8203e880a06f0e56df11bf6be42f9d51d7f218470af50897271dfa0c0a4615fe08b6c68fe18875c73624c97c285cf862f86080018302bf6294100000000000000000000000000000000000000080801ba0f2904491d7d84ada0d1d94ee35aac71a0cb52ea2f8c16545f7493c14737ba15ca002f2ee18f95a17f1ba5ed106d78ae430d1fc3c5f88eb86cfbce90c9bc09b20c4c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x02bf62",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf2904491d7d84ada0d1d94ee35aac71a0cb52ea2f8c16545f7493c14737ba15c",
                         "s" : "0x02f2ee18f95a17f1ba5ed106d78ae430d1fc3c5f88eb86cfbce90c9bc09b20c4",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "df714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xdf714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "bc36dc1fb4dedd72537520032cffb70b0f5f3c29c9bae925ca0c83c226c3345c",
+        "lastblockhash" : "0x1647dc2872bc9b05bab6a8687349f4e46231195b0189d8bebc02ba9e66fab043",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -68,7 +73,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -76,7 +81,7 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02",
                 "code" : "0x600160025534600555",
                 "nonce" : "0x00",
@@ -85,46 +90,46 @@
                     "0x05" : "0x02"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5c49f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7623b61",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025534600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -132,36 +137,41 @@
         }
     },
     "callcall_00_OOGE_1_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcall_00_OOGE_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x01c49f",
-                    "hash" : "5fb6b4c9aeb3b2704bd806e937318a54584deb7485563c39410a30a73530cd75",
-                    "mixHash" : "fcfffcd9e04d3a11263059141f50bcc2a5822c38b6e923373befd05d39d8b7c9",
-                    "nonce" : "96b26305215b285e",
+                    "hash" : "0x04360fadb78b4efd38270c057c539ba01d1f7099aaf97a38b8186ef98a8c811d",
+                    "mixHash" : "0x2e658ae05c6b55c46bb3b1d97fc2b8c2bd73588db9113a6b5af2515fbd577df3",
+                    "nonce" : "0x57742f68d75c959b",
                     "number" : "0x01",
-                    "parentHash" : "ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
-                    "receiptTrie" : "e6aff110a7903b6979be95fb1a2bf7b209d4bf82f3b8ef9e87d7487f449e5f02",
-                    "stateRoot" : "9a2c583fb9edd66fc38f8bbef9ad68ab7aec0abd25906b550361dc296fd71162",
+                    "parentHash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
+                    "receiptTrie" : "0xe6aff110a7903b6979be95fb1a2bf7b209d4bf82f3b8ef9e87d7487f449e5f02",
+                    "stateRoot" : "0x9a2c583fb9edd66fc38f8bbef9ad68ab7aec0abd25906b550361dc296fd71162",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "31ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x31ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a2c583fb9edd66fc38f8bbef9ad68ab7aec0abd25906b550361dc296fd71162a031ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0a0e6aff110a7903b6979be95fb1a2bf7b209d4bf82f3b8ef9e87d7487f449e5f02b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301c49f8203e880a0fcfffcd9e04d3a11263059141f50bcc2a5822c38b6e923373befd05d39d8b7c98896b26305215b285ef862f86080018302bf6294100000000000000000000000000000000000000080801ba0f2904491d7d84ada0d1d94ee35aac71a0cb52ea2f8c16545f7493c14737ba15ca002f2ee18f95a17f1ba5ed106d78ae430d1fc3c5f88eb86cfbce90c9bc09b20c4c0",
+                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a2c583fb9edd66fc38f8bbef9ad68ab7aec0abd25906b550361dc296fd71162a031ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0a0e6aff110a7903b6979be95fb1a2bf7b209d4bf82f3b8ef9e87d7487f449e5f02b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301c49f8203e880a02e658ae05c6b55c46bb3b1d97fc2b8c2bd73588db9113a6b5af2515fbd577df38857742f68d75c959bf862f86080018302bf6294100000000000000000000000000000000000000080801ba0f2904491d7d84ada0d1d94ee35aac71a0cb52ea2f8c16545f7493c14737ba15ca002f2ee18f95a17f1ba5ed106d78ae430d1fc3c5f88eb86cfbce90c9bc09b20c4c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x02bf62",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf2904491d7d84ada0d1d94ee35aac71a0cb52ea2f8c16545f7493c14737ba15c",
                         "s" : "0x02f2ee18f95a17f1ba5ed106d78ae430d1fc3c5f88eb86cfbce90c9bc09b20c4",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -171,28 +181,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "df714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xdf714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "5fb6b4c9aeb3b2704bd806e937318a54584deb7485563c39410a30a73530cd75",
+        "lastblockhash" : "0x04360fadb78b4efd38270c057c539ba01d1f7099aaf97a38b8186ef98a8c811d",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -200,7 +210,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -208,7 +218,7 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02",
                 "code" : "0x600160025534600555",
                 "nonce" : "0x00",
@@ -217,46 +227,46 @@
                     "0x05" : "0x02"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5c49f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7623b61",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025534600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -264,36 +274,41 @@
         }
     },
     "callcall_00_OOGE_1_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcall_00_OOGE_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x02bf62",
-                    "hash" : "c962ab39e6ab7862aef2fbf8d03db36b0d8e8bd3f228d72fef765064fb079a05",
-                    "mixHash" : "4b2989e391924b1d92933fc9102fc070bae6333dc8244d6e8dd8d1e84379973b",
-                    "nonce" : "85600ebd0e5a1746",
+                    "hash" : "0xf42f60a053ad141d62c9db07f7838eacf666721fcc003bae0f19cc1be587d791",
+                    "mixHash" : "0xc3d7e5c36f5e76fe7cb2dc9997647c186abee135513cf918f02b95ad72b87b78",
+                    "nonce" : "0xf0474f9164f24eb0",
                     "number" : "0x01",
-                    "parentHash" : "ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
-                    "receiptTrie" : "0bad4ccdf70a9d6d6c3ce257166ba55c860fc9c9538ec27d6e5357a05f8e8ae8",
-                    "stateRoot" : "645ed78df4efc384798ed3e62e832fd787884fb7e1e8321074b41ea6df2e1802",
+                    "parentHash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
+                    "receiptTrie" : "0x0bad4ccdf70a9d6d6c3ce257166ba55c860fc9c9538ec27d6e5357a05f8e8ae8",
+                    "stateRoot" : "0x645ed78df4efc384798ed3e62e832fd787884fb7e1e8321074b41ea6df2e1802",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "31ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x31ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0645ed78df4efc384798ed3e62e832fd787884fb7e1e8321074b41ea6df2e1802a031ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0a00bad4ccdf70a9d6d6c3ce257166ba55c860fc9c9538ec27d6e5357a05f8e8ae8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808302bf628203e880a04b2989e391924b1d92933fc9102fc070bae6333dc8244d6e8dd8d1e84379973b8885600ebd0e5a1746f862f86080018302bf6294100000000000000000000000000000000000000080801ba0f2904491d7d84ada0d1d94ee35aac71a0cb52ea2f8c16545f7493c14737ba15ca002f2ee18f95a17f1ba5ed106d78ae430d1fc3c5f88eb86cfbce90c9bc09b20c4c0",
+                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0645ed78df4efc384798ed3e62e832fd787884fb7e1e8321074b41ea6df2e1802a031ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0a00bad4ccdf70a9d6d6c3ce257166ba55c860fc9c9538ec27d6e5357a05f8e8ae8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808302bf628203e880a0c3d7e5c36f5e76fe7cb2dc9997647c186abee135513cf918f02b95ad72b87b7888f0474f9164f24eb0f862f86080018302bf6294100000000000000000000000000000000000000080801ba0f2904491d7d84ada0d1d94ee35aac71a0cb52ea2f8c16545f7493c14737ba15ca002f2ee18f95a17f1ba5ed106d78ae430d1fc3c5f88eb86cfbce90c9bc09b20c4c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x02bf62",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf2904491d7d84ada0d1d94ee35aac71a0cb52ea2f8c16545f7493c14737ba15c",
                         "s" : "0x02f2ee18f95a17f1ba5ed106d78ae430d1fc3c5f88eb86cfbce90c9bc09b20c4",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -303,88 +318,88 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "df714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xdf714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c962ab39e6ab7862aef2fbf8d03db36b0d8e8bd3f228d72fef765064fb079a05",
+        "lastblockhash" : "0xf42f60a053ad141d62c9db07f7838eacf666721fcc003bae0f19cc1be587d791",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025534600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6bf62",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a761409e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025534600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -392,36 +407,41 @@
         }
     },
     "callcall_00_OOGE_1_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcall_00_OOGE_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x02bf62",
-                    "hash" : "40bf47c7ef90c2dcffc1980a2ec067284f0e36ef7072326e6dd1ec9e0900e0f8",
-                    "mixHash" : "a37fd7cf6e3808852b14500ec917f9f4160ba5c7cf668662621722d36b017350",
-                    "nonce" : "09ec80b75b23889d",
+                    "hash" : "0x806921f4145f970d79adde75e09cf758d70baec26822e8ca0002816c4adad910",
+                    "mixHash" : "0x6bb0aa9eccb6bbc194469b33e95b69efda8c5605a294bf814def349f99230f41",
+                    "nonce" : "0x0bae2b30f7380f68",
                     "number" : "0x01",
-                    "parentHash" : "ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
-                    "receiptTrie" : "0bad4ccdf70a9d6d6c3ce257166ba55c860fc9c9538ec27d6e5357a05f8e8ae8",
-                    "stateRoot" : "645ed78df4efc384798ed3e62e832fd787884fb7e1e8321074b41ea6df2e1802",
+                    "parentHash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
+                    "receiptTrie" : "0x0bad4ccdf70a9d6d6c3ce257166ba55c860fc9c9538ec27d6e5357a05f8e8ae8",
+                    "stateRoot" : "0x645ed78df4efc384798ed3e62e832fd787884fb7e1e8321074b41ea6df2e1802",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "31ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x31ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0645ed78df4efc384798ed3e62e832fd787884fb7e1e8321074b41ea6df2e1802a031ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0a00bad4ccdf70a9d6d6c3ce257166ba55c860fc9c9538ec27d6e5357a05f8e8ae8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808302bf628203e880a0a37fd7cf6e3808852b14500ec917f9f4160ba5c7cf668662621722d36b0173508809ec80b75b23889df862f86080018302bf6294100000000000000000000000000000000000000080801ba0f2904491d7d84ada0d1d94ee35aac71a0cb52ea2f8c16545f7493c14737ba15ca002f2ee18f95a17f1ba5ed106d78ae430d1fc3c5f88eb86cfbce90c9bc09b20c4c0",
+                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0645ed78df4efc384798ed3e62e832fd787884fb7e1e8321074b41ea6df2e1802a031ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0a00bad4ccdf70a9d6d6c3ce257166ba55c860fc9c9538ec27d6e5357a05f8e8ae8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808302bf628203e880a06bb0aa9eccb6bbc194469b33e95b69efda8c5605a294bf814def349f99230f41880bae2b30f7380f68f862f86080018302bf6294100000000000000000000000000000000000000080801ba0f2904491d7d84ada0d1d94ee35aac71a0cb52ea2f8c16545f7493c14737ba15ca002f2ee18f95a17f1ba5ed106d78ae430d1fc3c5f88eb86cfbce90c9bc09b20c4c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x02bf62",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xf2904491d7d84ada0d1d94ee35aac71a0cb52ea2f8c16545f7493c14737ba15c",
                         "s" : "0x02f2ee18f95a17f1ba5ed106d78ae430d1fc3c5f88eb86cfbce90c9bc09b20c4",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -431,88 +451,232 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "df714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xdf714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "40bf47c7ef90c2dcffc1980a2ec067284f0e36ef7072326e6dd1ec9e0900e0f8",
+        "lastblockhash" : "0x806921f4145f970d79adde75e09cf758d70baec26822e8ca0002816c4adad910",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025534600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f6bf62",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a761409e",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006001731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x600160025534600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcall_00_OOGE_1_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcall_00_OOGE_1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x01c49f",
+                    "hash" : "0x80a57d17e95730ae1712df0e22cb372ed1a35e567259da7ba0d585a8f3da52e0",
+                    "mixHash" : "0x2504e19e6be38c6d1fc8255d8bfb3e8a4de4834cc999ade162760378a3669951",
+                    "nonce" : "0x808510695dc2306d",
+                    "number" : "0x01",
+                    "parentHash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
+                    "receiptTrie" : "0xaf0bacc9c88f7f366e10dc24b62a5e4188212ac033c9dfba47c66dd08aad3dcc",
+                    "stateRoot" : "0x22c09aa3744d7627116d0d355cc9f8ae6450348270d8b4f99d0a5242c9087b71",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x31ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa022c09aa3744d7627116d0d355cc9f8ae6450348270d8b4f99d0a5242c9087b71a031ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0a0af0bacc9c88f7f366e10dc24b62a5e4188212ac033c9dfba47c66dd08aad3dccb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301c49f8203e880a02504e19e6be38c6d1fc8255d8bfb3e8a4de4834cc999ade162760378a366995188808510695dc2306df862f86080018302bf6294100000000000000000000000000000000000000080801ba0f2904491d7d84ada0d1d94ee35aac71a0cb52ea2f8c16545f7493c14737ba15ca002f2ee18f95a17f1ba5ed106d78ae430d1fc3c5f88eb86cfbce90c9bc09b20c4c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x02bf62",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xf2904491d7d84ada0d1d94ee35aac71a0cb52ea2f8c16545f7493c14737ba15c",
+                        "s" : "0x02f2ee18f95a17f1ba5ed106d78ae430d1fc3c5f88eb86cfbce90c9bc09b20c4",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xdf714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x80a57d17e95730ae1712df0e22cb372ed1a35e567259da7ba0d585a8f3da52e0",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a763ffff",
+                "code" : "0x60406000604060006001731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a763ffff",
+                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02",
+                "code" : "0x600160025534600555",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01",
+                    "0x05" : "0x02"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5c49f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7623b61",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025534600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2_d0g0v0.json
index 1ee985d13..4892d14ec 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcall_00_OOGE_2_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcall_00_OOGE_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x01c49f",
-                    "hash" : "79d08e061a0df45220599590d82f414e0d64b7bbffd7eb7a57d8c6b68705cf1e",
-                    "mixHash" : "cd4ddb557e472a2af875573acb04bbbf4ce52dc0581fa620e08a3c76d8701a37",
-                    "nonce" : "72a164580bd2d17b",
+                    "hash" : "0xfd26e1c9765ad3baf38670266a649732c2067f77cd17500444685658a65d2aff",
+                    "mixHash" : "0x7a58de8a10eca1e0c99d6e7e467d8d576c07b1026b261f3f831dbb9a39d934f6",
+                    "nonce" : "0xce850756b4ef4aa3",
                     "number" : "0x01",
-                    "parentHash" : "ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
-                    "receiptTrie" : "e6aff110a7903b6979be95fb1a2bf7b209d4bf82f3b8ef9e87d7487f449e5f02",
-                    "stateRoot" : "9a2c583fb9edd66fc38f8bbef9ad68ab7aec0abd25906b550361dc296fd71162",
+                    "parentHash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
+                    "receiptTrie" : "0xe6aff110a7903b6979be95fb1a2bf7b209d4bf82f3b8ef9e87d7487f449e5f02",
+                    "stateRoot" : "0x9a2c583fb9edd66fc38f8bbef9ad68ab7aec0abd25906b550361dc296fd71162",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "cb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0d",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xcb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a2c583fb9edd66fc38f8bbef9ad68ab7aec0abd25906b550361dc296fd71162a0cb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0da0e6aff110a7903b6979be95fb1a2bf7b209d4bf82f3b8ef9e87d7487f449e5f02b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301c49f8203e880a0cd4ddb557e472a2af875573acb04bbbf4ce52dc0581fa620e08a3c76d8701a378872a164580bd2d17bf862f860800183024a3294100000000000000000000000000000000000000080801ba00e79a8e2bee8caba64c0ee950cbad88be43d0e969099460c5decd35d13e53281a044746499069c1fcd3d5960d630448c3d0d43ec25eeb7f4fbca1938b319529334c0",
+                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a2c583fb9edd66fc38f8bbef9ad68ab7aec0abd25906b550361dc296fd71162a0cb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0da0e6aff110a7903b6979be95fb1a2bf7b209d4bf82f3b8ef9e87d7487f449e5f02b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301c49f8203e880a07a58de8a10eca1e0c99d6e7e467d8d576c07b1026b261f3f831dbb9a39d934f688ce850756b4ef4aa3f862f860800183024a3294100000000000000000000000000000000000000080801ba00e79a8e2bee8caba64c0ee950cbad88be43d0e969099460c5decd35d13e53281a044746499069c1fcd3d5960d630448c3d0d43ec25eeb7f4fbca1938b319529334c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x024a32",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x0e79a8e2bee8caba64c0ee950cbad88be43d0e969099460c5decd35d13e53281",
                         "s" : "0x44746499069c1fcd3d5960d630448c3d0d43ec25eeb7f4fbca1938b319529334",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "df714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xdf714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "79d08e061a0df45220599590d82f414e0d64b7bbffd7eb7a57d8c6b68705cf1e",
+        "lastblockhash" : "0xfd26e1c9765ad3baf38670266a649732c2067f77cd17500444685658a65d2aff",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -68,7 +73,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -76,7 +81,7 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02",
                 "code" : "0x600160025534600555",
                 "nonce" : "0x00",
@@ -85,46 +90,46 @@
                     "0x05" : "0x02"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5c49f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7623b61",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025534600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -132,36 +137,41 @@
         }
     },
     "callcall_00_OOGE_2_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcall_00_OOGE_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x01c49f",
-                    "hash" : "bc473cedba09b8995feb0dde3b0a3159eeba0bd458dcef53d1266a3f063746dc",
-                    "mixHash" : "dc00ab5eeac52b0b4ddb2c1382ab6b8540430d3b22c5a2fc38f65647c80b6a2b",
-                    "nonce" : "0743628cbaddf80c",
+                    "hash" : "0x4075346e8875f29b1b0fab1cba4647750ba7adfbc3356f33a111052b3be12cc0",
+                    "mixHash" : "0x2d0de4a0972cfce1f001738e31ab459f7c4c359251b21321d14f7a7708d6ce29",
+                    "nonce" : "0xc9fe2c3f73dd9a14",
                     "number" : "0x01",
-                    "parentHash" : "ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
-                    "receiptTrie" : "e6aff110a7903b6979be95fb1a2bf7b209d4bf82f3b8ef9e87d7487f449e5f02",
-                    "stateRoot" : "9a2c583fb9edd66fc38f8bbef9ad68ab7aec0abd25906b550361dc296fd71162",
+                    "parentHash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
+                    "receiptTrie" : "0xe6aff110a7903b6979be95fb1a2bf7b209d4bf82f3b8ef9e87d7487f449e5f02",
+                    "stateRoot" : "0x9a2c583fb9edd66fc38f8bbef9ad68ab7aec0abd25906b550361dc296fd71162",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "cb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0d",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xcb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a2c583fb9edd66fc38f8bbef9ad68ab7aec0abd25906b550361dc296fd71162a0cb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0da0e6aff110a7903b6979be95fb1a2bf7b209d4bf82f3b8ef9e87d7487f449e5f02b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301c49f8203e880a0dc00ab5eeac52b0b4ddb2c1382ab6b8540430d3b22c5a2fc38f65647c80b6a2b880743628cbaddf80cf862f860800183024a3294100000000000000000000000000000000000000080801ba00e79a8e2bee8caba64c0ee950cbad88be43d0e969099460c5decd35d13e53281a044746499069c1fcd3d5960d630448c3d0d43ec25eeb7f4fbca1938b319529334c0",
+                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a2c583fb9edd66fc38f8bbef9ad68ab7aec0abd25906b550361dc296fd71162a0cb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0da0e6aff110a7903b6979be95fb1a2bf7b209d4bf82f3b8ef9e87d7487f449e5f02b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301c49f8203e880a02d0de4a0972cfce1f001738e31ab459f7c4c359251b21321d14f7a7708d6ce2988c9fe2c3f73dd9a14f862f860800183024a3294100000000000000000000000000000000000000080801ba00e79a8e2bee8caba64c0ee950cbad88be43d0e969099460c5decd35d13e53281a044746499069c1fcd3d5960d630448c3d0d43ec25eeb7f4fbca1938b319529334c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x024a32",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x0e79a8e2bee8caba64c0ee950cbad88be43d0e969099460c5decd35d13e53281",
                         "s" : "0x44746499069c1fcd3d5960d630448c3d0d43ec25eeb7f4fbca1938b319529334",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -171,28 +181,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "df714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xdf714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "bc473cedba09b8995feb0dde3b0a3159eeba0bd458dcef53d1266a3f063746dc",
+        "lastblockhash" : "0x4075346e8875f29b1b0fab1cba4647750ba7adfbc3356f33a111052b3be12cc0",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -200,7 +210,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a763ffff",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
@@ -208,7 +218,7 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x02",
                 "code" : "0x600160025534600555",
                 "nonce" : "0x00",
@@ -217,46 +227,46 @@
                     "0x05" : "0x02"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5c49f",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7623b61",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025534600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -264,36 +274,41 @@
         }
     },
     "callcall_00_OOGE_2_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcall_00_OOGE_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x024a32",
-                    "hash" : "ef3ac09085102332327180740e6b08560ce454e1cccd68eda30d33c05342d03c",
-                    "mixHash" : "ec853f85247c2bb143caca4d53f7eeaa9a411472833c56edf16a3dd504b1fa25",
-                    "nonce" : "8842bb402398b855",
+                    "hash" : "0x162a0ebefaaed4e0148986fe1a83cee5339906eac9de7eefe5cf708276f5cf23",
+                    "mixHash" : "0x38347d039c532dd747b7e567dbd1cfe0fcf97eb7608d350a72db3846af38899b",
+                    "nonce" : "0x3224218d8c8f6b07",
                     "number" : "0x01",
-                    "parentHash" : "ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
-                    "receiptTrie" : "9b3c24098d829140f2c7274dd582fa0010ced14c76a9f9359dbba25f04612bd4",
-                    "stateRoot" : "bc5aa2e0a24bfd85afd0939d8100f0b8e2adc115105eefde52615fbbb4a1b7b3",
+                    "parentHash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
+                    "receiptTrie" : "0x9b3c24098d829140f2c7274dd582fa0010ced14c76a9f9359dbba25f04612bd4",
+                    "stateRoot" : "0xbc5aa2e0a24bfd85afd0939d8100f0b8e2adc115105eefde52615fbbb4a1b7b3",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "cb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0d",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xcb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc5aa2e0a24bfd85afd0939d8100f0b8e2adc115105eefde52615fbbb4a1b7b3a0cb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0da09b3c24098d829140f2c7274dd582fa0010ced14c76a9f9359dbba25f04612bd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083024a328203e880a0ec853f85247c2bb143caca4d53f7eeaa9a411472833c56edf16a3dd504b1fa25888842bb402398b855f862f860800183024a3294100000000000000000000000000000000000000080801ba00e79a8e2bee8caba64c0ee950cbad88be43d0e969099460c5decd35d13e53281a044746499069c1fcd3d5960d630448c3d0d43ec25eeb7f4fbca1938b319529334c0",
+                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc5aa2e0a24bfd85afd0939d8100f0b8e2adc115105eefde52615fbbb4a1b7b3a0cb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0da09b3c24098d829140f2c7274dd582fa0010ced14c76a9f9359dbba25f04612bd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083024a328203e880a038347d039c532dd747b7e567dbd1cfe0fcf97eb7608d350a72db3846af38899b883224218d8c8f6b07f862f860800183024a3294100000000000000000000000000000000000000080801ba00e79a8e2bee8caba64c0ee950cbad88be43d0e969099460c5decd35d13e53281a044746499069c1fcd3d5960d630448c3d0d43ec25eeb7f4fbca1938b319529334c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x024a32",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x0e79a8e2bee8caba64c0ee950cbad88be43d0e969099460c5decd35d13e53281",
                         "s" : "0x44746499069c1fcd3d5960d630448c3d0d43ec25eeb7f4fbca1938b319529334",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -303,88 +318,88 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "df714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xdf714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "ef3ac09085102332327180740e6b08560ce454e1cccd68eda30d33c05342d03c",
+        "lastblockhash" : "0x162a0ebefaaed4e0148986fe1a83cee5339906eac9de7eefe5cf708276f5cf23",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025534600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f64a32",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a761b5ce",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025534600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -392,36 +407,41 @@
         }
     },
     "callcall_00_OOGE_2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcall_00_OOGE_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x024a32",
-                    "hash" : "b8f97ca53f4a901dfd586c4db823a0b856646b4578e8970857d2f635079a9231",
-                    "mixHash" : "45a8928ba4eb59d551c6f716469561a77750d9c6b982c2d30f76fc8b53691d0a",
-                    "nonce" : "0204a29674eea130",
+                    "hash" : "0x2bdc4b33ba2dae754a5241f3278d34a003a231a23c5730773a52e716f6dfad58",
+                    "mixHash" : "0xf5e2acb4cdad83f1b60bc5d1393aae9eb39fdba4714f5b07df5f470f1030d0d2",
+                    "nonce" : "0xc61ee3a19b2eed98",
                     "number" : "0x01",
-                    "parentHash" : "ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
-                    "receiptTrie" : "9b3c24098d829140f2c7274dd582fa0010ced14c76a9f9359dbba25f04612bd4",
-                    "stateRoot" : "bc5aa2e0a24bfd85afd0939d8100f0b8e2adc115105eefde52615fbbb4a1b7b3",
+                    "parentHash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
+                    "receiptTrie" : "0x9b3c24098d829140f2c7274dd582fa0010ced14c76a9f9359dbba25f04612bd4",
+                    "stateRoot" : "0xbc5aa2e0a24bfd85afd0939d8100f0b8e2adc115105eefde52615fbbb4a1b7b3",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "cb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0d",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xcb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc5aa2e0a24bfd85afd0939d8100f0b8e2adc115105eefde52615fbbb4a1b7b3a0cb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0da09b3c24098d829140f2c7274dd582fa0010ced14c76a9f9359dbba25f04612bd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083024a328203e880a045a8928ba4eb59d551c6f716469561a77750d9c6b982c2d30f76fc8b53691d0a880204a29674eea130f862f860800183024a3294100000000000000000000000000000000000000080801ba00e79a8e2bee8caba64c0ee950cbad88be43d0e969099460c5decd35d13e53281a044746499069c1fcd3d5960d630448c3d0d43ec25eeb7f4fbca1938b319529334c0",
+                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc5aa2e0a24bfd85afd0939d8100f0b8e2adc115105eefde52615fbbb4a1b7b3a0cb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0da09b3c24098d829140f2c7274dd582fa0010ced14c76a9f9359dbba25f04612bd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083024a328203e880a0f5e2acb4cdad83f1b60bc5d1393aae9eb39fdba4714f5b07df5f470f1030d0d288c61ee3a19b2eed98f862f860800183024a3294100000000000000000000000000000000000000080801ba00e79a8e2bee8caba64c0ee950cbad88be43d0e969099460c5decd35d13e53281a044746499069c1fcd3d5960d630448c3d0d43ec25eeb7f4fbca1938b319529334c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x024a32",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x0e79a8e2bee8caba64c0ee950cbad88be43d0e969099460c5decd35d13e53281",
                         "s" : "0x44746499069c1fcd3d5960d630448c3d0d43ec25eeb7f4fbca1938b319529334",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -431,88 +451,232 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x01c9c380",
             "gasUsed" : "0x00",
-            "hash" : "ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "df714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xdf714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b8f97ca53f4a901dfd586c4db823a0b856646b4578e8970857d2f635079a9231",
+        "lastblockhash" : "0x2bdc4b33ba2dae754a5241f3278d34a003a231a23c5730773a52e716f6dfad58",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025534600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f64a32",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a761b5ce",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006001731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x600160025534600555",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcall_00_OOGE_2_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcall_00_OOGE_2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x01c9c380",
+                    "gasUsed" : "0x01c49f",
+                    "hash" : "0x7ad00b313d7fcbf06f7e63637ae08439ff63c3b9de24218ee03f2c3e5b0ec8a7",
+                    "mixHash" : "0xa56554b96c4ac6a7ab35f890025418845d991ea4008b72d3a4a3c4d84a5d7dd6",
+                    "nonce" : "0x98d5a59b9e28c19d",
+                    "number" : "0x01",
+                    "parentHash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
+                    "receiptTrie" : "0xaf0bacc9c88f7f366e10dc24b62a5e4188212ac033c9dfba47c66dd08aad3dcc",
+                    "stateRoot" : "0x22c09aa3744d7627116d0d355cc9f8ae6450348270d8b4f99d0a5242c9087b71",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xcb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0d",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa022c09aa3744d7627116d0d355cc9f8ae6450348270d8b4f99d0a5242c9087b71a0cb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0da0af0bacc9c88f7f366e10dc24b62a5e4188212ac033c9dfba47c66dd08aad3dccb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301c49f8203e880a0a56554b96c4ac6a7ab35f890025418845d991ea4008b72d3a4a3c4d84a5d7dd68898d5a59b9e28c19df862f860800183024a3294100000000000000000000000000000000000000080801ba00e79a8e2bee8caba64c0ee950cbad88be43d0e969099460c5decd35d13e53281a044746499069c1fcd3d5960d630448c3d0d43ec25eeb7f4fbca1938b319529334c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x024a32",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x0e79a8e2bee8caba64c0ee950cbad88be43d0e969099460c5decd35d13e53281",
+                        "s" : "0x44746499069c1fcd3d5960d630448c3d0d43ec25eeb7f4fbca1938b319529334",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x01c9c380",
+            "gasUsed" : "0x00",
+            "hash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xdf714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x7ad00b313d7fcbf06f7e63637ae08439ff63c3b9de24218ee03f2c3e5b0ec8a7",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a763ffff",
+                "code" : "0x60406000604060006001731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0de0b6b3a763ffff",
+                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620186a0f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x02",
+                "code" : "0x600160025534600555",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01",
+                    "0x05" : "0x02"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5c49f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7623b61",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006001731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006002731000000000000000000000000000000000000002620186a0f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x600160025534600555",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer_d0g0v0.json
index facaadfc9..dcf2498d8 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcall_00_OOGE_valueTransfer_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcall_00_OOGE_valueTransfer_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x017689",
-                    "hash" : "cbaef00ed09ad579272b07842e550622f0df0bccbc7136cac7da7b3e0dcf7436",
-                    "mixHash" : "6568567f25ea806e32eb0978f8f9451730fd8df9d5964e7c7c53c7a64a5ea004",
-                    "nonce" : "1ea87a88221c2558",
+                    "hash" : "0xbbe91f9bfcefeb878efe02fd6e9937a602c5410d56d500521967823e13e189ea",
+                    "mixHash" : "0x6c9ac906ba602c1209cd14b2be27f3a710a86fcc1e128aee70ca42685227231a",
+                    "nonce" : "0xc157bb7f116139c5",
                     "number" : "0x01",
-                    "parentHash" : "843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520f",
-                    "receiptTrie" : "ea4e401adec27a31207e403178dc668b5898c8e296c4b7dc3c798db7a2d0d8e7",
-                    "stateRoot" : "45a5d8970629c42a663dddbad82f557be23909ccd44cb5bd86aacaf28f039ffa",
+                    "parentHash" : "0x843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520f",
+                    "receiptTrie" : "0xea4e401adec27a31207e403178dc668b5898c8e296c4b7dc3c798db7a2d0d8e7",
+                    "stateRoot" : "0x45a5d8970629c42a663dddbad82f557be23909ccd44cb5bd86aacaf28f039ffa",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045a5d8970629c42a663dddbad82f557be23909ccd44cb5bd86aacaf28f039ffaa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ea4e401adec27a31207e403178dc668b5898c8e296c4b7dc3c798db7a2d0d8e7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830176898203e880a06568567f25ea806e32eb0978f8f9451730fd8df9d5964e7c7c53c7a64a5ea004881ea87a88221c2558f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045a5d8970629c42a663dddbad82f557be23909ccd44cb5bd86aacaf28f039ffaa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ea4e401adec27a31207e403178dc668b5898c8e296c4b7dc3c798db7a2d0d8e7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830176898203e880a06c9ac906ba602c1209cd14b2be27f3a710a86fcc1e128aee70ca42685227231a88c157bb7f116139c5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8a6a0701eaa525e665d8440278fb01df0106e5cbc5ce34943703372d0afed495",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8a6a0701eaa525e665d8440278fb01df0106e5cbc5ce34943703372d0afed495",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a6a0701eaa525e665d8440278fb01df0106e5cbc5ce34943703372d0afed495a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "cbaef00ed09ad579272b07842e550622f0df0bccbc7136cac7da7b3e0dcf7436",
+        "lastblockhash" : "0xbbe91f9bfcefeb878efe02fd6e9937a602c5410d56d500521967823e13e189ea",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffec",
                 "code" : "0x60406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -68,7 +73,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0a",
                 "code" : "0x6040600060406000600a73100000000000000000000000000000000000000261c350f1600155",
                 "nonce" : "0x00",
@@ -76,7 +81,7 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0a",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
@@ -84,46 +89,46 @@
                     "0x02" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f57689",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7628977",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000600a73100000000000000000000000000000000000000261c350f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -131,36 +136,41 @@
         }
     },
     "callcall_00_OOGE_valueTransfer_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcall_00_OOGE_valueTransfer_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x017689",
-                    "hash" : "d3df7aa22c4e1af34f71b217ff7c0675e03c12a46e2edd2dbbe06d86cda14870",
-                    "mixHash" : "dede599a3d62f29073195c87df645118e120406ac36f99b37cbec719f6576bae",
-                    "nonce" : "5dfdf7ba717ed5f7",
+                    "hash" : "0xe1d330173c6ddd1c3cc89bfec054e160f0217a698156256798ed9f949d6c669c",
+                    "mixHash" : "0x806fd9f6b0a65220ecdc372dca65ed300b45a1cc4c482a7471a5df410abbbd00",
+                    "nonce" : "0x442d7ac034f1fbc7",
                     "number" : "0x01",
-                    "parentHash" : "843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520f",
-                    "receiptTrie" : "ea4e401adec27a31207e403178dc668b5898c8e296c4b7dc3c798db7a2d0d8e7",
-                    "stateRoot" : "45a5d8970629c42a663dddbad82f557be23909ccd44cb5bd86aacaf28f039ffa",
+                    "parentHash" : "0x843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520f",
+                    "receiptTrie" : "0xea4e401adec27a31207e403178dc668b5898c8e296c4b7dc3c798db7a2d0d8e7",
+                    "stateRoot" : "0x45a5d8970629c42a663dddbad82f557be23909ccd44cb5bd86aacaf28f039ffa",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045a5d8970629c42a663dddbad82f557be23909ccd44cb5bd86aacaf28f039ffaa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ea4e401adec27a31207e403178dc668b5898c8e296c4b7dc3c798db7a2d0d8e7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830176898203e880a0dede599a3d62f29073195c87df645118e120406ac36f99b37cbec719f6576bae885dfdf7ba717ed5f7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045a5d8970629c42a663dddbad82f557be23909ccd44cb5bd86aacaf28f039ffaa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ea4e401adec27a31207e403178dc668b5898c8e296c4b7dc3c798db7a2d0d8e7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830176898203e880a0806fd9f6b0a65220ecdc372dca65ed300b45a1cc4c482a7471a5df410abbbd0088442d7ac034f1fbc7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -170,28 +180,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8a6a0701eaa525e665d8440278fb01df0106e5cbc5ce34943703372d0afed495",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8a6a0701eaa525e665d8440278fb01df0106e5cbc5ce34943703372d0afed495",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a6a0701eaa525e665d8440278fb01df0106e5cbc5ce34943703372d0afed495a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d3df7aa22c4e1af34f71b217ff7c0675e03c12a46e2edd2dbbe06d86cda14870",
+        "lastblockhash" : "0xe1d330173c6ddd1c3cc89bfec054e160f0217a698156256798ed9f949d6c669c",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a763ffec",
                 "code" : "0x60406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
@@ -199,7 +209,7 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0a",
                 "code" : "0x6040600060406000600a73100000000000000000000000000000000000000261c350f1600155",
                 "nonce" : "0x00",
@@ -207,7 +217,7 @@
                     "0x01" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x0a",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
@@ -215,46 +225,46 @@
                     "0x02" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f57689",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7628977",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000600a73100000000000000000000000000000000000000261c350f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -262,36 +272,41 @@
         }
     },
     "callcall_00_OOGE_valueTransfer_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcall_00_OOGE_valueTransfer_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "a309b4e35fc9b479e4586e6ce804a221c5118dbbe02b04b5e544efc2a4715fd1",
-                    "mixHash" : "0a845c7635b441621de3e410ee2b0677924a0a0c7f6bc3d493ecd8c7499ad000",
-                    "nonce" : "b1f181ee67e52738",
+                    "hash" : "0xf9c0711419a60a7c314eda9132e606014828fa57a3ef623f5c31bf240ea62d9f",
+                    "mixHash" : "0x800a94db867476ffb8e870def9183063912ad576a98157d322bcb8dc821ccfa0",
+                    "nonce" : "0xbce2b408c38dd79c",
                     "number" : "0x01",
-                    "parentHash" : "843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520f",
-                    "receiptTrie" : "f49fb1832b775e8a5af1e54424b020cdf256bc97502295d5ecb62c2e68275c08",
-                    "stateRoot" : "ccda66ffce3d74f032171087efe4c229b54704c2ebdb4e5119a8e5fc8b9b1366",
+                    "parentHash" : "0x843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520f",
+                    "receiptTrie" : "0xf49fb1832b775e8a5af1e54424b020cdf256bc97502295d5ecb62c2e68275c08",
+                    "stateRoot" : "0xccda66ffce3d74f032171087efe4c229b54704c2ebdb4e5119a8e5fc8b9b1366",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ccda66ffce3d74f032171087efe4c229b54704c2ebdb4e5119a8e5fc8b9b1366a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f49fb1832b775e8a5af1e54424b020cdf256bc97502295d5ecb62c2e68275c08b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a00a845c7635b441621de3e410ee2b0677924a0a0c7f6bc3d493ecd8c7499ad00088b1f181ee67e52738f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ccda66ffce3d74f032171087efe4c229b54704c2ebdb4e5119a8e5fc8b9b1366a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f49fb1832b775e8a5af1e54424b020cdf256bc97502295d5ecb62c2e68275c08b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a0800a94db867476ffb8e870def9183063912ad576a98157d322bcb8dc821ccfa088bce2b408c38dd79cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -301,88 +316,88 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8a6a0701eaa525e665d8440278fb01df0106e5cbc5ce34943703372d0afed495",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8a6a0701eaa525e665d8440278fb01df0106e5cbc5ce34943703372d0afed495",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a6a0701eaa525e665d8440278fb01df0106e5cbc5ce34943703372d0afed495a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "a309b4e35fc9b479e4586e6ce804a221c5118dbbe02b04b5e544efc2a4715fd1",
+        "lastblockhash" : "0xf9c0711419a60a7c314eda9132e606014828fa57a3ef623f5c31bf240ea62d9f",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000600a73100000000000000000000000000000000000000261c350f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f69fe0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7616020",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000600a73100000000000000000000000000000000000000261c350f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -390,36 +405,41 @@
         }
     },
     "callcall_00_OOGE_valueTransfer_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcall_00_OOGE_valueTransfer_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "a63ca28be9d83789406f527fa1038cb0cbc544a8235d9bde201b6780c52f17c5",
-                    "mixHash" : "011983faf44ad623f438e70900889d082d563397591667d62f6ed67d02292b2e",
-                    "nonce" : "083b0388b8bbbb8b",
+                    "hash" : "0x0add6f17ffd893bb0ffc9d3d38f6098a23be06e09ff1bc92d305ba67a4ed8a9c",
+                    "mixHash" : "0x0d069b7b4eadc4a43fca9c6bde4fd41f91161ae36912677a1f86087c255253b6",
+                    "nonce" : "0x39af34c051bc87be",
                     "number" : "0x01",
-                    "parentHash" : "843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520f",
-                    "receiptTrie" : "f49fb1832b775e8a5af1e54424b020cdf256bc97502295d5ecb62c2e68275c08",
-                    "stateRoot" : "ccda66ffce3d74f032171087efe4c229b54704c2ebdb4e5119a8e5fc8b9b1366",
+                    "parentHash" : "0x843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520f",
+                    "receiptTrie" : "0xf49fb1832b775e8a5af1e54424b020cdf256bc97502295d5ecb62c2e68275c08",
+                    "stateRoot" : "0xccda66ffce3d74f032171087efe4c229b54704c2ebdb4e5119a8e5fc8b9b1366",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ccda66ffce3d74f032171087efe4c229b54704c2ebdb4e5119a8e5fc8b9b1366a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f49fb1832b775e8a5af1e54424b020cdf256bc97502295d5ecb62c2e68275c08b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a0011983faf44ad623f438e70900889d082d563397591667d62f6ed67d02292b2e88083b0388b8bbbb8bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ccda66ffce3d74f032171087efe4c229b54704c2ebdb4e5119a8e5fc8b9b1366a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f49fb1832b775e8a5af1e54424b020cdf256bc97502295d5ecb62c2e68275c08b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a00d069b7b4eadc4a43fca9c6bde4fd41f91161ae36912677a1f86087c255253b68839af34c051bc87bef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -429,88 +449,231 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520f",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8a6a0701eaa525e665d8440278fb01df0106e5cbc5ce34943703372d0afed495",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8a6a0701eaa525e665d8440278fb01df0106e5cbc5ce34943703372d0afed495",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a6a0701eaa525e665d8440278fb01df0106e5cbc5ce34943703372d0afed495a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "a63ca28be9d83789406f527fa1038cb0cbc544a8235d9bde201b6780c52f17c5",
+        "lastblockhash" : "0x0add6f17ffd893bb0ffc9d3d38f6098a23be06e09ff1bc92d305ba67a4ed8a9c",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000600a73100000000000000000000000000000000000000261c350f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f69fe0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7616020",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x60406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000600a73100000000000000000000000000000000000000261c350f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcall_00_OOGE_valueTransfer_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcall_00_OOGE_valueTransfer_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x017689",
+                    "hash" : "0x270b6a04c3e259bb0243d8f3905febd6e51b3c72f35575cd8c6c8cf73d75b8b7",
+                    "mixHash" : "0xe8544db564aa59cbe83330b0349b7fa69b621f8f38934d5280899bfc2250f5ad",
+                    "nonce" : "0x8f6a94e78e146772",
+                    "number" : "0x01",
+                    "parentHash" : "0x843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520f",
+                    "receiptTrie" : "0xb3c583aa26aca0cce389bccbf2a99a4f086449ddf52712fc4797b2997a5e49f7",
+                    "stateRoot" : "0x28b34b276c4f9e09ecc186dcdcdbd8bcaeaf6a9dc1d1ea8bef7bf5580c55078a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028b34b276c4f9e09ecc186dcdcdbd8bcaeaf6a9dc1d1ea8bef7bf5580c55078aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0b3c583aa26aca0cce389bccbf2a99a4f086449ddf52712fc4797b2997a5e49f7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830176898203e880a0e8544db564aa59cbe83330b0349b7fa69b621f8f38934d5280899bfc2250f5ad888f6a94e78e146772f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520f",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8a6a0701eaa525e665d8440278fb01df0106e5cbc5ce34943703372d0afed495",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a6a0701eaa525e665d8440278fb01df0106e5cbc5ce34943703372d0afed495a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x270b6a04c3e259bb0243d8f3905febd6e51b3c72f35575cd8c6c8cf73d75b8b7",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a763ffec",
+                "code" : "0x60406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0a",
+                "code" : "0x6040600060406000600a73100000000000000000000000000000000000000261c350f1600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x0a",
+                "code" : "0x60016002556001600252",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x02" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f57689",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7628977",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x60406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000600a73100000000000000000000000000000000000000261c350f1600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60016002556001600252",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter_d0g0v0.json
index 004777392..647aa8023 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcall_000_OOGMAfter_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcall_000_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "ccbc4e1a58232997737e6efcb5868be5c9d0bb2b569ddb5fde75a91865a7d920",
-                    "mixHash" : "0e1376ada33837920ae4ee69e30cec71a984367447c565a172a6f8e8b2cf5825",
-                    "nonce" : "afddc52f416dd321",
+                    "hash" : "0xa1d5b78fe79e9c5a8ea1b99abce68c5ee4fdbd56dc3be59f0853737e80371740",
+                    "mixHash" : "0x1e5d96303c7c8e99183ce0d0fa45e0a4a9cf7346f7f6c86691b790abacad624e",
+                    "nonce" : "0xab69166133409c45",
                     "number" : "0x01",
-                    "parentHash" : "00c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9c",
-                    "receiptTrie" : "e49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254",
-                    "stateRoot" : "e5195971f320a4da1b922a1643b2274f65a9e42903dcb65820491645c7b16974",
+                    "parentHash" : "0x00c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9c",
+                    "receiptTrie" : "0xe49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254",
+                    "stateRoot" : "0xe5195971f320a4da1b922a1643b2274f65a9e42903dcb65820491645c7b16974",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a000c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5195971f320a4da1b922a1643b2274f65a9e42903dcb65820491645c7b16974a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a00e1376ada33837920ae4ee69e30cec71a984367447c565a172a6f8e8b2cf582588afddc52f416dd321f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a000c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5195971f320a4da1b922a1643b2274f65a9e42903dcb65820491645c7b16974a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a01e5d96303c7c8e99183ce0d0fa45e0a4a9cf7346f7f6c86691b790abacad624e88ab69166133409c45f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "00c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x00c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987aba",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987aba",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987abaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "ccbc4e1a58232997737e6efcb5868be5c9d0bb2b569ddb5fde75a91865a7d920",
+        "lastblockhash" : "0xa1d5b78fe79e9c5a8ea1b99abce68c5ee4fdbd56dc3be59f0853737e80371740",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcallcall_000_OOGMAfter_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcall_000_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "8c651c90664e1dc540532604457c16fdf3483f62586452869c5676351229b1f3",
-                    "mixHash" : "021b22a9d2c88ddfa5f3be2aa3340bdef443ebbdcf813d0e441ac9dbc1cecb34",
-                    "nonce" : "ce0b6d1a3e3448e5",
+                    "hash" : "0x1179a6916fce00eb48a0d28c03317f7dfe225e615c29dbcdab27193012a4ee2a",
+                    "mixHash" : "0x28b0faa87225e102c912bba1c313cc6577483149e669f242480356cedfbdea90",
+                    "nonce" : "0x36ddb765fd32247d",
                     "number" : "0x01",
-                    "parentHash" : "00c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9c",
-                    "receiptTrie" : "e49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254",
-                    "stateRoot" : "e5195971f320a4da1b922a1643b2274f65a9e42903dcb65820491645c7b16974",
+                    "parentHash" : "0x00c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9c",
+                    "receiptTrie" : "0xe49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254",
+                    "stateRoot" : "0xe5195971f320a4da1b922a1643b2274f65a9e42903dcb65820491645c7b16974",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a000c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5195971f320a4da1b922a1643b2274f65a9e42903dcb65820491645c7b16974a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0021b22a9d2c88ddfa5f3be2aa3340bdef443ebbdcf813d0e441ac9dbc1cecb3488ce0b6d1a3e3448e5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a000c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5195971f320a4da1b922a1643b2274f65a9e42903dcb65820491645c7b16974a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a028b0faa87225e102c912bba1c313cc6577483149e669f242480356cedfbdea908836ddb765fd32247df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "00c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x00c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987aba",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987aba",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987abaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "8c651c90664e1dc540532604457c16fdf3483f62586452869c5676351229b1f3",
+        "lastblockhash" : "0x1179a6916fce00eb48a0d28c03317f7dfe225e615c29dbcdab27193012a4ee2a",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcallcall_000_OOGMAfter_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcall_000_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "e7a689249ddd1fec01d0c6c77767fbc2fe7605410c402f6ae9eb792bb81e1b92",
-                    "mixHash" : "4ef54263e57754f5d62538e907f6da8096b7919949e8151ebf98c1b632914ea2",
-                    "nonce" : "9ff3871e0cf072ca",
+                    "hash" : "0xec97fc6627dd655c647574c1ad864c4b97c2f72b5f58d7bc4610650103c6484f",
+                    "mixHash" : "0xab5b34ad6d07ae2b50e2f1d9d951a524abe5d3e60e46e091e344f69ee1d64a68",
+                    "nonce" : "0xce597bbdd5780588",
                     "number" : "0x01",
-                    "parentHash" : "00c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9c",
-                    "receiptTrie" : "0b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62",
-                    "stateRoot" : "44b3ed7f2b5c4631db6e6caa3087162374af3b130aeed8fb064ebe82c148006b",
+                    "parentHash" : "0x00c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9c",
+                    "receiptTrie" : "0x0b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62",
+                    "stateRoot" : "0x44b3ed7f2b5c4631db6e6caa3087162374af3b130aeed8fb064ebe82c148006b",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a000c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044b3ed7f2b5c4631db6e6caa3087162374af3b130aeed8fb064ebe82c148006ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a04ef54263e57754f5d62538e907f6da8096b7919949e8151ebf98c1b632914ea2889ff3871e0cf072caf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a000c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044b3ed7f2b5c4631db6e6caa3087162374af3b130aeed8fb064ebe82c148006ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0ab5b34ad6d07ae2b50e2f1d9d951a524abe5d3e60e46e091e344f69ee1d64a6888ce597bbdd5780588f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,102 +340,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "00c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x00c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987aba",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987aba",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987abaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "e7a689249ddd1fec01d0c6c77767fbc2fe7605410c402f6ae9eb792bb81e1b92",
+        "lastblockhash" : "0xec97fc6627dd655c647574c1ad864c4b97c2f72b5f58d7bc4610650103c6484f",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -428,36 +443,41 @@
         }
     },
     "callcallcall_000_OOGMAfter_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcall_000_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "49753b6ed15315ca68755aadad458e7c441aa8252ecb35343d9a063a52123a3b",
-                    "mixHash" : "0bdcb2cfcd0d7361615f2f76b8c7192ecca586f431c6b6b0c54112d738b7d845",
-                    "nonce" : "951f2603e8182b2c",
+                    "hash" : "0xac4ca9667123489a92cb92f78916b265d697597aa41dc17b4ea6773d5574469c",
+                    "mixHash" : "0x5143676dd78756b87b760b0d8bd40b147b7d1fe7a13af8e61a75d133d2f62aac",
+                    "nonce" : "0x4e8f3adc2cea04b0",
                     "number" : "0x01",
-                    "parentHash" : "00c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9c",
-                    "receiptTrie" : "0b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62",
-                    "stateRoot" : "44b3ed7f2b5c4631db6e6caa3087162374af3b130aeed8fb064ebe82c148006b",
+                    "parentHash" : "0x00c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9c",
+                    "receiptTrie" : "0x0b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62",
+                    "stateRoot" : "0x44b3ed7f2b5c4631db6e6caa3087162374af3b130aeed8fb064ebe82c148006b",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a000c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044b3ed7f2b5c4631db6e6caa3087162374af3b130aeed8fb064ebe82c148006ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a00bdcb2cfcd0d7361615f2f76b8c7192ecca586f431c6b6b0c54112d738b7d84588951f2603e8182b2cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a000c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044b3ed7f2b5c4631db6e6caa3087162374af3b130aeed8fb064ebe82c148006ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a05143676dd78756b87b760b0d8bd40b147b7d1fe7a13af8e61a75d133d2f62aac884e8f3adc2cea04b0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -467,102 +487,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "00c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9c",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x00c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987aba",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987aba",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987abaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "49753b6ed15315ca68755aadad458e7c441aa8252ecb35343d9a063a52123a3b",
+        "lastblockhash" : "0xac4ca9667123489a92cb92f78916b265d697597aa41dc17b4ea6773d5574469c",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcall_000_OOGMAfter_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcall_000_OOGMAfter_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0155fd",
+                    "hash" : "0x484f915c9a65c2fe2eadfda75a6278f351f0297e25e529ecf6ee42e1d6e3a514",
+                    "mixHash" : "0x33114fa93850e3f4cc50163f8f5404dcc413202f4cdf80dfd981fa6f49d7bc51",
+                    "nonce" : "0x55d322459ef42320",
+                    "number" : "0x01",
+                    "parentHash" : "0x00c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9c",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0xe071b9b09ca723711959b59fa6be0b437d14b5f146596d54bb4dcba20988f6e1",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a000c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e071b9b09ca723711959b59fa6be0b437d14b5f146596d54bb4dcba20988f6e1a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a033114fa93850e3f4cc50163f8f5404dcc413202f4cdf80dfd981fa6f49d7bc518855d322459ef42320f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x00c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9c",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987aba",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987abaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x484f915c9a65c2fe2eadfda75a6278f351f0297e25e529ecf6ee42e1d6e3a514",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555fd",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa03",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1_d0g0v0.json
index eff04061e..8f5390a58 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcallcode_001_OOGMAfter_1_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcallcode_001_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155f6",
-                    "hash" : "68f1d3012d21192a4d3b7bbe6f25c05bdce3c59a8161ddfb57a2b8af28fd8dc1",
-                    "mixHash" : "c56c73dbeb1ac02bdf744bd47c6d89d6684f8404dd606127191ab3f2b5b5cc08",
-                    "nonce" : "de4fda4349a0237d",
+                    "hash" : "0xbc5f2a58f89feb3640bf8b47dd1fb8aa99d89f35c7d12bf0f2eb2247fa51d8fc",
+                    "mixHash" : "0xa22bcf5f6b34c949239e8e38902688618dff1a2cc8181cfcbcdc6abf1fadbc30",
+                    "nonce" : "0xd111eca916e08d0e",
                     "number" : "0x01",
-                    "parentHash" : "00d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6",
-                    "receiptTrie" : "af6da6153fd508de6ae6f5973c541dd71fa8e5f1a04be228ad6ead940a08d313",
-                    "stateRoot" : "36fc1cde48a007dd72ac83fadbdd74b2bb507a2afdc1f5f7777db1d3bfc7c37d",
+                    "parentHash" : "0x00d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6",
+                    "receiptTrie" : "0xaf6da6153fd508de6ae6f5973c541dd71fa8e5f1a04be228ad6ead940a08d313",
+                    "stateRoot" : "0x36fc1cde48a007dd72ac83fadbdd74b2bb507a2afdc1f5f7777db1d3bfc7c37d",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a000d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036fc1cde48a007dd72ac83fadbdd74b2bb507a2afdc1f5f7777db1d3bfc7c37da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0af6da6153fd508de6ae6f5973c541dd71fa8e5f1a04be228ad6ead940a08d313b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f68203e880a0c56c73dbeb1ac02bdf744bd47c6d89d6684f8404dd606127191ab3f2b5b5cc0888de4fda4349a0237df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a000d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036fc1cde48a007dd72ac83fadbdd74b2bb507a2afdc1f5f7777db1d3bfc7c37da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0af6da6153fd508de6ae6f5973c541dd71fa8e5f1a04be228ad6ead940a08d313b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f68203e880a0a22bcf5f6b34c949239e8e38902688618dff1a2cc8181cfcbcdc6abf1fadbc3088d111eca916e08d0ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "00d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x00d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "485a6f52025c76f783a581db3d094fad582aaa62f21d5741d175452b81a67dd6",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x485a6f52025c76f783a581db3d094fad582aaa62f21d5741d175452b81a67dd6",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0485a6f52025c76f783a581db3d094fad582aaa62f21d5741d175452b81a67dd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "68f1d3012d21192a4d3b7bbe6f25c05bdce3c59a8161ddfb57a2b8af28fd8dc1",
+        "lastblockhash" : "0xbc5f2a58f89feb3640bf8b47dd1fb8aa99d89f35c7d12bf0f2eb2247fa51d8fc",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c89f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555f6",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa0a",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c89f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcallcallcode_001_OOGMAfter_1_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcallcode_001_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155f6",
-                    "hash" : "3f16a9dfa48614a3ae537089b99513a414bdca9347e0a3a62777080e73ca88c8",
-                    "mixHash" : "62fc2bc782c73eb12ee8aa815e57965310d6a526b1227b2a30a43d4bfc6c04bd",
-                    "nonce" : "c4f5de8e5fdb5a98",
+                    "hash" : "0xbbb8b62d6c3e26ef53d8cc9b1d06b6252ff52cc780243ba0f055b29757bd09d6",
+                    "mixHash" : "0x2f8e7c5bff97d18cd0eb4a7e6b08007f1fe6a270551f649eef86d84b15839e2f",
+                    "nonce" : "0x513568a6690ba634",
                     "number" : "0x01",
-                    "parentHash" : "00d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6",
-                    "receiptTrie" : "af6da6153fd508de6ae6f5973c541dd71fa8e5f1a04be228ad6ead940a08d313",
-                    "stateRoot" : "36fc1cde48a007dd72ac83fadbdd74b2bb507a2afdc1f5f7777db1d3bfc7c37d",
+                    "parentHash" : "0x00d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6",
+                    "receiptTrie" : "0xaf6da6153fd508de6ae6f5973c541dd71fa8e5f1a04be228ad6ead940a08d313",
+                    "stateRoot" : "0x36fc1cde48a007dd72ac83fadbdd74b2bb507a2afdc1f5f7777db1d3bfc7c37d",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a000d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036fc1cde48a007dd72ac83fadbdd74b2bb507a2afdc1f5f7777db1d3bfc7c37da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0af6da6153fd508de6ae6f5973c541dd71fa8e5f1a04be228ad6ead940a08d313b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f68203e880a062fc2bc782c73eb12ee8aa815e57965310d6a526b1227b2a30a43d4bfc6c04bd88c4f5de8e5fdb5a98f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a000d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036fc1cde48a007dd72ac83fadbdd74b2bb507a2afdc1f5f7777db1d3bfc7c37da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0af6da6153fd508de6ae6f5973c541dd71fa8e5f1a04be228ad6ead940a08d313b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f68203e880a02f8e7c5bff97d18cd0eb4a7e6b08007f1fe6a270551f649eef86d84b15839e2f88513568a6690ba634f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "00d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x00d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "485a6f52025c76f783a581db3d094fad582aaa62f21d5741d175452b81a67dd6",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x485a6f52025c76f783a581db3d094fad582aaa62f21d5741d175452b81a67dd6",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0485a6f52025c76f783a581db3d094fad582aaa62f21d5741d175452b81a67dd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "3f16a9dfa48614a3ae537089b99513a414bdca9347e0a3a62777080e73ca88c8",
+        "lastblockhash" : "0xbbb8b62d6c3e26ef53d8cc9b1d06b6252ff52cc780243ba0f055b29757bd09d6",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c89f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555f6",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa0a",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c89f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcallcallcode_001_OOGMAfter_1_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcallcode_001_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150ce",
-                    "hash" : "975d64a2214401552d360c75b5ae5776ff9a8bbf8b017c3fc3d46bbc8c5f94f8",
-                    "mixHash" : "6a5feb3150e57ec54ba2318c9ed05df64c25e3ce5dcf43fc766594f62645d574",
-                    "nonce" : "a20092bff2b317f3",
+                    "hash" : "0x9b95c0da80edd5ce89ef5a84387d0379235d1c2b140a69081e0cf4049adad258",
+                    "mixHash" : "0xe11238f3adce17fcc528b44e490e15bb15cf6724a393279bacd938d34be371a0",
+                    "nonce" : "0xe6bb2d18463185dc",
                     "number" : "0x01",
-                    "parentHash" : "00d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6",
-                    "receiptTrie" : "60ae7e81b11deabe23e5d1ef468b928319929ba86da233309de14723a1194bcf",
-                    "stateRoot" : "ed938afa49c128465cae4f34d95098d6353ee7278a0fad8256b3a0d47c151219",
+                    "parentHash" : "0x00d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6",
+                    "receiptTrie" : "0x60ae7e81b11deabe23e5d1ef468b928319929ba86da233309de14723a1194bcf",
+                    "stateRoot" : "0xed938afa49c128465cae4f34d95098d6353ee7278a0fad8256b3a0d47c151219",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a000d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed938afa49c128465cae4f34d95098d6353ee7278a0fad8256b3a0d47c151219a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea060ae7e81b11deabe23e5d1ef468b928319929ba86da233309de14723a1194bcfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150ce8203e880a06a5feb3150e57ec54ba2318c9ed05df64c25e3ce5dcf43fc766594f62645d57488a20092bff2b317f3f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a000d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed938afa49c128465cae4f34d95098d6353ee7278a0fad8256b3a0d47c151219a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea060ae7e81b11deabe23e5d1ef468b928319929ba86da233309de14723a1194bcfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150ce8203e880a0e11238f3adce17fcc528b44e490e15bb15cf6724a393279bacd938d34be371a088e6bb2d18463185dcf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,28 +340,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "00d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x00d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "485a6f52025c76f783a581db3d094fad582aaa62f21d5741d175452b81a67dd6",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x485a6f52025c76f783a581db3d094fad582aaa62f21d5741d175452b81a67dd6",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0485a6f52025c76f783a581db3d094fad582aaa62f21d5741d175452b81a67dd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "975d64a2214401552d360c75b5ae5776ff9a8bbf8b017c3fc3d46bbc8c5f94f8",
+        "lastblockhash" : "0x9b95c0da80edd5ce89ef5a84387d0379235d1c2b140a69081e0cf4049adad258",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
                 "nonce" : "0x00",
@@ -354,74 +369,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c89f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550ce",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af32",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c89f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -429,36 +444,41 @@
         }
     },
     "callcallcallcode_001_OOGMAfter_1_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcallcode_001_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cd",
-                    "hash" : "6792bcec9225098badc0aaa1833c608d02898126cf47fe983769384104dad32f",
-                    "mixHash" : "01406bdac62c6a9549dc22c8a3896e01be43db89a5ee7662bb8fbf675f7465b3",
-                    "nonce" : "097ce1f440017fe5",
+                    "hash" : "0xf8ca34187a27ad5af2bc9c05c227629581b2e4fab725fd30a95fa9153995a205",
+                    "mixHash" : "0x2d66cc50f9cdc167d6071a434583ab370b404977fcdc35cf225ddfd1754a80c1",
+                    "nonce" : "0xbca66e32565288bd",
                     "number" : "0x01",
-                    "parentHash" : "00d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6",
-                    "receiptTrie" : "c7e418a8d10c522d9ac60d1d03012cb5852135cede278d5004bcaf6ae9aa5154",
-                    "stateRoot" : "d921e191af27920ed037f493f7fbed4c10ff0f240488cf1d397de78d83d65cab",
+                    "parentHash" : "0x00d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6",
+                    "receiptTrie" : "0xc7e418a8d10c522d9ac60d1d03012cb5852135cede278d5004bcaf6ae9aa5154",
+                    "stateRoot" : "0xd921e191af27920ed037f493f7fbed4c10ff0f240488cf1d397de78d83d65cab",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a000d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d921e191af27920ed037f493f7fbed4c10ff0f240488cf1d397de78d83d65caba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c7e418a8d10c522d9ac60d1d03012cb5852135cede278d5004bcaf6ae9aa5154b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cd8203e880a001406bdac62c6a9549dc22c8a3896e01be43db89a5ee7662bb8fbf675f7465b388097ce1f440017fe5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a000d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d921e191af27920ed037f493f7fbed4c10ff0f240488cf1d397de78d83d65caba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c7e418a8d10c522d9ac60d1d03012cb5852135cede278d5004bcaf6ae9aa5154b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cd8203e880a02d66cc50f9cdc167d6071a434583ab370b404977fcdc35cf225ddfd1754a80c188bca66e32565288bdf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -468,102 +488,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "00d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x00d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "485a6f52025c76f783a581db3d094fad582aaa62f21d5741d175452b81a67dd6",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x485a6f52025c76f783a581db3d094fad582aaa62f21d5741d175452b81a67dd6",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0485a6f52025c76f783a581db3d094fad582aaa62f21d5741d175452b81a67dd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "6792bcec9225098badc0aaa1833c608d02898126cf47fe983769384104dad32f",
+        "lastblockhash" : "0xf8ca34187a27ad5af2bc9c05c227629581b2e4fab725fd30a95fa9153995a205",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c89f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af33",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c89f26001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcallcode_001_OOGMAfter_1_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcallcode_001_OOGMAfter_1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0155f6",
+                    "hash" : "0x3b0bef5217796b4246b8dcb0ec28a2d6fa2d5505d8e2964e89d878b4402274b9",
+                    "mixHash" : "0xde8561a84fe5b2d4283b5a7d77dbd347effb418181494822725f56ca025b9d1d",
+                    "nonce" : "0xa25d626b8ed594c4",
+                    "number" : "0x01",
+                    "parentHash" : "0x00d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6",
+                    "receiptTrie" : "0x05fd6e125cf4882932953e984d97095e88b58aa0a28c3ac2b05f43e41afeb047",
+                    "stateRoot" : "0x7bceace67e182627e25159c891972604a2f6de072cb5e2b31af432c97bb69ed8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a000d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07bceace67e182627e25159c891972604a2f6de072cb5e2b31af432c97bb69ed8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea005fd6e125cf4882932953e984d97095e88b58aa0a28c3ac2b05f43e41afeb047b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f68203e880a0de8561a84fe5b2d4283b5a7d77dbd347effb418181494822725f56ca025b9d1d88a25d626b8ed594c4f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x00d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x485a6f52025c76f783a581db3d094fad582aaa62f21d5741d175452b81a67dd6",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0485a6f52025c76f783a581db3d094fad582aaa62f21d5741d175452b81a67dd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3b0bef5217796b4246b8dcb0ec28a2d6fa2d5505d8e2964e89d878b4402274b9",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c89f26001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555f6",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa0a",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c89f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2_d0g0v0.json
index 3ba9e35dd..1e0fbdab0 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcallcode_001_OOGMAfter_2_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcallcode_001_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015602",
-                    "hash" : "d155fb8333e4acc92012219af73224eba47d8c788dc895a679ed438107859c09",
-                    "mixHash" : "230e96894dc29c630b02608e800a90fc9d7e2931a392e94dcde49c49db173803",
-                    "nonce" : "148b697dc54c6825",
+                    "hash" : "0x5aa0f312a1c683bba940663cff4c2969c87eade37cd0b3a1f25752cb33b0a5a7",
+                    "mixHash" : "0x4f9f08a242dcdb8bde4869c7151a351a71429e983ebfcac09a5901317da58e44",
+                    "nonce" : "0xb25132a4821b87e0",
                     "number" : "0x01",
-                    "parentHash" : "354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12",
-                    "receiptTrie" : "ddacf4e0d058547475d88db110ab97a4cb2c1086ed59a6f86c9f18476e09115f",
-                    "stateRoot" : "82e9bbdb92a621c9caf0a12d02e6e92ae4dc293901e435ad6094e07b29e3ffa1",
+                    "parentHash" : "0x354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12",
+                    "receiptTrie" : "0xddacf4e0d058547475d88db110ab97a4cb2c1086ed59a6f86c9f18476e09115f",
+                    "stateRoot" : "0x82e9bbdb92a621c9caf0a12d02e6e92ae4dc293901e435ad6094e07b29e3ffa1",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082e9bbdb92a621c9caf0a12d02e6e92ae4dc293901e435ad6094e07b29e3ffa1a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ddacf4e0d058547475d88db110ab97a4cb2c1086ed59a6f86c9f18476e09115fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156028203e880a0230e96894dc29c630b02608e800a90fc9d7e2931a392e94dcde49c49db17380388148b697dc54c6825f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082e9bbdb92a621c9caf0a12d02e6e92ae4dc293901e435ad6094e07b29e3ffa1a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ddacf4e0d058547475d88db110ab97a4cb2c1086ed59a6f86c9f18476e09115fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156028203e880a04f9f08a242dcdb8bde4869c7151a351a71429e983ebfcac09a5901317da58e4488b25132a4821b87e0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "292b6b5db83743e8ec7294ba6eaeddd7fa0f0142738c27415d1b714e0e61f9a2",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x292b6b5db83743e8ec7294ba6eaeddd7fa0f0142738c27415d1b714e0e61f9a2",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0292b6b5db83743e8ec7294ba6eaeddd7fa0f0142738c27415d1b714e0e61f9a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d155fb8333e4acc92012219af73224eba47d8c788dc895a679ed438107859c09",
+        "lastblockhash" : "0x5aa0f312a1c683bba940663cff4c2969c87eade37cd0b3a1f25752cb33b0a5a7",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55602",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762a9fe",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcallcallcode_001_OOGMAfter_2_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcallcode_001_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015602",
-                    "hash" : "38bdd2bf846ab087eef8e347b7164292c5ae10d87329017b35faa3e7dec5ea1c",
-                    "mixHash" : "42c1bf8b96597ee80f70b3c394a0c019e246b16e23dbc3d8e9122d8a66c3bb9c",
-                    "nonce" : "ecd5fb3408aae22a",
+                    "hash" : "0xeb25342920c1492a8614c99f4cacb8dbfb1aaac9f3ca1acf3ad5ed0e247486da",
+                    "mixHash" : "0x395871ec953ab43129006077e740680154a7bf3558a185f12b4ed6c94bcc15ff",
+                    "nonce" : "0x4d3cc53833e27595",
                     "number" : "0x01",
-                    "parentHash" : "354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12",
-                    "receiptTrie" : "ddacf4e0d058547475d88db110ab97a4cb2c1086ed59a6f86c9f18476e09115f",
-                    "stateRoot" : "82e9bbdb92a621c9caf0a12d02e6e92ae4dc293901e435ad6094e07b29e3ffa1",
+                    "parentHash" : "0x354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12",
+                    "receiptTrie" : "0xddacf4e0d058547475d88db110ab97a4cb2c1086ed59a6f86c9f18476e09115f",
+                    "stateRoot" : "0x82e9bbdb92a621c9caf0a12d02e6e92ae4dc293901e435ad6094e07b29e3ffa1",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082e9bbdb92a621c9caf0a12d02e6e92ae4dc293901e435ad6094e07b29e3ffa1a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ddacf4e0d058547475d88db110ab97a4cb2c1086ed59a6f86c9f18476e09115fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156028203e880a042c1bf8b96597ee80f70b3c394a0c019e246b16e23dbc3d8e9122d8a66c3bb9c88ecd5fb3408aae22af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082e9bbdb92a621c9caf0a12d02e6e92ae4dc293901e435ad6094e07b29e3ffa1a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ddacf4e0d058547475d88db110ab97a4cb2c1086ed59a6f86c9f18476e09115fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156028203e880a0395871ec953ab43129006077e740680154a7bf3558a185f12b4ed6c94bcc15ff884d3cc53833e27595f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "292b6b5db83743e8ec7294ba6eaeddd7fa0f0142738c27415d1b714e0e61f9a2",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x292b6b5db83743e8ec7294ba6eaeddd7fa0f0142738c27415d1b714e0e61f9a2",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0292b6b5db83743e8ec7294ba6eaeddd7fa0f0142738c27415d1b714e0e61f9a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "38bdd2bf846ab087eef8e347b7164292c5ae10d87329017b35faa3e7dec5ea1c",
+        "lastblockhash" : "0xeb25342920c1492a8614c99f4cacb8dbfb1aaac9f3ca1acf3ad5ed0e247486da",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55602",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762a9fe",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcallcallcode_001_OOGMAfter_2_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcallcode_001_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150da",
-                    "hash" : "d6ebd6a572565b804f83ea32485f1360373b88e1b82f4e018d47925e78662497",
-                    "mixHash" : "abed8a5a4925e162464f7ed667764f13d94ce2877ab9961f409cb42e37f2ecee",
-                    "nonce" : "f2cca9426062b4f8",
+                    "hash" : "0xa92f218960e6bc81a641af4225293437e65938c4518b426f2b56e7f4367f6c1b",
+                    "mixHash" : "0x41d439b43b77559b934024fde8068ed5225719f534f15ca254286f22ff38164b",
+                    "nonce" : "0x89ccd1442aba1e02",
                     "number" : "0x01",
-                    "parentHash" : "354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12",
-                    "receiptTrie" : "8d06d77bff9c251dfbd24e7c2e2977f3fafd99c72cf35cf61d262cf6757f25d6",
-                    "stateRoot" : "ca6ddbbcb27a24b5340051e1924d7ec759c2a0bc94970f6bd6539c17b7c44b66",
+                    "parentHash" : "0x354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12",
+                    "receiptTrie" : "0x8d06d77bff9c251dfbd24e7c2e2977f3fafd99c72cf35cf61d262cf6757f25d6",
+                    "stateRoot" : "0xca6ddbbcb27a24b5340051e1924d7ec759c2a0bc94970f6bd6539c17b7c44b66",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca6ddbbcb27a24b5340051e1924d7ec759c2a0bc94970f6bd6539c17b7c44b66a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08d06d77bff9c251dfbd24e7c2e2977f3fafd99c72cf35cf61d262cf6757f25d6b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150da8203e880a0abed8a5a4925e162464f7ed667764f13d94ce2877ab9961f409cb42e37f2ecee88f2cca9426062b4f8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca6ddbbcb27a24b5340051e1924d7ec759c2a0bc94970f6bd6539c17b7c44b66a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08d06d77bff9c251dfbd24e7c2e2977f3fafd99c72cf35cf61d262cf6757f25d6b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150da8203e880a041d439b43b77559b934024fde8068ed5225719f534f15ca254286f22ff38164b8889ccd1442aba1e02f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,28 +340,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "292b6b5db83743e8ec7294ba6eaeddd7fa0f0142738c27415d1b714e0e61f9a2",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x292b6b5db83743e8ec7294ba6eaeddd7fa0f0142738c27415d1b714e0e61f9a2",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0292b6b5db83743e8ec7294ba6eaeddd7fa0f0142738c27415d1b714e0e61f9a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d6ebd6a572565b804f83ea32485f1360373b88e1b82f4e018d47925e78662497",
+        "lastblockhash" : "0xa92f218960e6bc81a641af4225293437e65938c4518b426f2b56e7f4367f6c1b",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
@@ -354,74 +369,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550da",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af26",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -429,36 +444,41 @@
         }
     },
     "callcallcallcode_001_OOGMAfter_2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcallcode_001_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0f4650e8a2162e869c79dbab013ae2d20cc978c8fbc128b1deb0b69383c06628",
-                    "mixHash" : "edfa44a3be8c51b786ddf1fd9e2238205ddfd1c5aa2460c96a33f1c41d55ea91",
-                    "nonce" : "3651b9325d0c3a39",
+                    "hash" : "0x42985cfef12fe17fb2b07116f4844af4fca2fa4aa7d9b6b85c14512a3aa546fb",
+                    "mixHash" : "0x22398f5c662e1687ffe274240f725f63e706284e784f6e86bb2d42f9faa65ebc",
+                    "nonce" : "0x8a573aaf70fe7763",
                     "number" : "0x01",
-                    "parentHash" : "354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12",
-                    "receiptTrie" : "abcff8dd9e67d55de49338d5a22960752969d45486b541c566ed690881c81858",
-                    "stateRoot" : "f33001e8cb8fc14a1e8551d182d41306c44b220f18e274cf99bc187e5f96c686",
+                    "parentHash" : "0x354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12",
+                    "receiptTrie" : "0xabcff8dd9e67d55de49338d5a22960752969d45486b541c566ed690881c81858",
+                    "stateRoot" : "0xf33001e8cb8fc14a1e8551d182d41306c44b220f18e274cf99bc187e5f96c686",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f33001e8cb8fc14a1e8551d182d41306c44b220f18e274cf99bc187e5f96c686a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0abcff8dd9e67d55de49338d5a22960752969d45486b541c566ed690881c81858b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0edfa44a3be8c51b786ddf1fd9e2238205ddfd1c5aa2460c96a33f1c41d55ea91883651b9325d0c3a39f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f33001e8cb8fc14a1e8551d182d41306c44b220f18e274cf99bc187e5f96c686a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0abcff8dd9e67d55de49338d5a22960752969d45486b541c566ed690881c81858b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a022398f5c662e1687ffe274240f725f63e706284e784f6e86bb2d42f9faa65ebc888a573aaf70fe7763f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -468,102 +488,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "292b6b5db83743e8ec7294ba6eaeddd7fa0f0142738c27415d1b714e0e61f9a2",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x292b6b5db83743e8ec7294ba6eaeddd7fa0f0142738c27415d1b714e0e61f9a2",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0292b6b5db83743e8ec7294ba6eaeddd7fa0f0142738c27415d1b714e0e61f9a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0f4650e8a2162e869c79dbab013ae2d20cc978c8fbc128b1deb0b69383c06628",
+        "lastblockhash" : "0x42985cfef12fe17fb2b07116f4844af4fca2fa4aa7d9b6b85c14512a3aa546fb",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f16001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcallcode_001_OOGMAfter_2_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcallcode_001_OOGMAfter_2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x015602",
+                    "hash" : "0x612bf04ee266c1684d3af51d42cdee47fed9b18bba1fcfd4d1b538bbb6199fd4",
+                    "mixHash" : "0x0dfa94d49c8befc4288d9a7ba743f55e52c12ead877158fc58a466b9a8f1c955",
+                    "nonce" : "0x47cf79092d6504b0",
+                    "number" : "0x01",
+                    "parentHash" : "0x354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12",
+                    "receiptTrie" : "0x02959d9bc264a46eaf807babe155ad9a49dafa3ec0af02bc1d0e97a52084baa3",
+                    "stateRoot" : "0x62236b06ddf5f611e39ac47c2244c95603f6913e11f35eae4846bfa9410e798f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062236b06ddf5f611e39ac47c2244c95603f6913e11f35eae4846bfa9410e798fa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea002959d9bc264a46eaf807babe155ad9a49dafa3ec0af02bc1d0e97a52084baa3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156028203e880a00dfa94d49c8befc4288d9a7ba743f55e52c12ead877158fc58a466b9a8f1c9558847cf79092d6504b0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x292b6b5db83743e8ec7294ba6eaeddd7fa0f0142738c27415d1b714e0e61f9a2",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0292b6b5db83743e8ec7294ba6eaeddd7fa0f0142738c27415d1b714e0e61f9a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x612bf04ee266c1684d3af51d42cdee47fed9b18bba1fcfd4d1b538bbb6199fd4",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f16001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f55602",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762a9fe",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3_d0g0v0.json
index e4d36e13f..4ad6dc36d 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcallcode_001_OOGMAfter_3_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcallcode_001_OOGMAfter_3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "50092a0c38490af79b64c1bf7434daef4a8175beb38feaf0811aa0a3e44b4fab",
-                    "mixHash" : "b64565df8772563ffd18656ff356a536f1b958268fbdb94dc6b888fc095801c6",
-                    "nonce" : "c43d613a9b9e03a5",
+                    "hash" : "0xf29fea5704e05e050487361ef9be075505a9d56e174e07eca7a7b5409838babb",
+                    "mixHash" : "0xc2da2aa44da9a677ab2f8cd55d73d529ed663bdd5695231d293381fc83acb6a0",
+                    "nonce" : "0x4b51252f04200e1d",
                     "number" : "0x01",
-                    "parentHash" : "28923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebf",
-                    "receiptTrie" : "5940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5",
-                    "stateRoot" : "430c4119c8e2d6becc7ac4f5a28b8c13bd022fb7a7091d06e677320c7147e52d",
+                    "parentHash" : "0x28923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebf",
+                    "receiptTrie" : "0x5940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5",
+                    "stateRoot" : "0x430c4119c8e2d6becc7ac4f5a28b8c13bd022fb7a7091d06e677320c7147e52d",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a028923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0430c4119c8e2d6becc7ac4f5a28b8c13bd022fb7a7091d06e677320c7147e52da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0b64565df8772563ffd18656ff356a536f1b958268fbdb94dc6b888fc095801c688c43d613a9b9e03a5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a028923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0430c4119c8e2d6becc7ac4f5a28b8c13bd022fb7a7091d06e677320c7147e52da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0c2da2aa44da9a677ab2f8cd55d73d529ed663bdd5695231d293381fc83acb6a0884b51252f04200e1df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "28923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebf",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x28923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "50092a0c38490af79b64c1bf7434daef4a8175beb38feaf0811aa0a3e44b4fab",
+        "lastblockhash" : "0xf29fea5704e05e050487361ef9be075505a9d56e174e07eca7a7b5409838babb",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcallcallcode_001_OOGMAfter_3_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcallcode_001_OOGMAfter_3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "3cfcb78015e2e0df67d53b77c48aba5986d9e1a589261b99ce2845ba5b9ff11c",
-                    "mixHash" : "c9ff4966fc4c8a0b24c42f018f121616bfefb3c192147364e0c0d8e784b9b0be",
-                    "nonce" : "43551977183b7507",
+                    "hash" : "0xb6b0f392b8ddef8f5ed892ca368c3016e52178b37e7b53008be01dcf2b782820",
+                    "mixHash" : "0xed3c847042d12cbca2ece64c3d16765917b159d466e504e90ba522157dc4f04c",
+                    "nonce" : "0xb7f11e2c0236664d",
                     "number" : "0x01",
-                    "parentHash" : "28923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebf",
-                    "receiptTrie" : "5940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5",
-                    "stateRoot" : "430c4119c8e2d6becc7ac4f5a28b8c13bd022fb7a7091d06e677320c7147e52d",
+                    "parentHash" : "0x28923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebf",
+                    "receiptTrie" : "0x5940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5",
+                    "stateRoot" : "0x430c4119c8e2d6becc7ac4f5a28b8c13bd022fb7a7091d06e677320c7147e52d",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a028923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0430c4119c8e2d6becc7ac4f5a28b8c13bd022fb7a7091d06e677320c7147e52da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0c9ff4966fc4c8a0b24c42f018f121616bfefb3c192147364e0c0d8e784b9b0be8843551977183b7507f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a028923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0430c4119c8e2d6becc7ac4f5a28b8c13bd022fb7a7091d06e677320c7147e52da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0ed3c847042d12cbca2ece64c3d16765917b159d466e504e90ba522157dc4f04c88b7f11e2c0236664df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "28923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebf",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x28923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "3cfcb78015e2e0df67d53b77c48aba5986d9e1a589261b99ce2845ba5b9ff11c",
+        "lastblockhash" : "0xb6b0f392b8ddef8f5ed892ca368c3016e52178b37e7b53008be01dcf2b782820",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcallcallcode_001_OOGMAfter_3_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcallcode_001_OOGMAfter_3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "e6aea0ed4be403473af96567fd4e691958903df468d7f7981f91eabc4f0ba2f7",
-                    "mixHash" : "6310be95f50a16bc7cc48c268ea20b210bc34b4169641f40c952af54ac2a65df",
-                    "nonce" : "43247d667fe9f24b",
+                    "hash" : "0xb06698d98e731e1086b87675462ab26758a76214faa776cf14a353b7584d095f",
+                    "mixHash" : "0xac321b1ada12b08218346a8a368e7053028364c767c25a9a4ae8cf62972737ca",
+                    "nonce" : "0x3664b08cdad5ebf2",
                     "number" : "0x01",
-                    "parentHash" : "28923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebf",
-                    "receiptTrie" : "5d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7",
-                    "stateRoot" : "dc6f9f117d822962d2fb341b86fd1eae4c359d6b947d7263e7991363cfff32e3",
+                    "parentHash" : "0x28923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebf",
+                    "receiptTrie" : "0x5d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7",
+                    "stateRoot" : "0xdc6f9f117d822962d2fb341b86fd1eae4c359d6b947d7263e7991363cfff32e3",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a028923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc6f9f117d822962d2fb341b86fd1eae4c359d6b947d7263e7991363cfff32e3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a06310be95f50a16bc7cc48c268ea20b210bc34b4169641f40c952af54ac2a65df8843247d667fe9f24bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a028923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc6f9f117d822962d2fb341b86fd1eae4c359d6b947d7263e7991363cfff32e3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0ac321b1ada12b08218346a8a368e7053028364c767c25a9a4ae8cf62972737ca883664b08cdad5ebf2f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,102 +340,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "28923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebf",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x28923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "e6aea0ed4be403473af96567fd4e691958903df468d7f7981f91eabc4f0ba2f7",
+        "lastblockhash" : "0xb06698d98e731e1086b87675462ab26758a76214faa776cf14a353b7584d095f",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -428,36 +443,41 @@
         }
     },
     "callcallcallcode_001_OOGMAfter_3_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcallcode_001_OOGMAfter_3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "e051c05e9d63ad9156dec3d10659301ff16c8dcf28dfb3bd27f94d00d4b3ff80",
-                    "mixHash" : "ff92080b34ec69745da823bfa2c6d6f7682cb26d69b2b66ee5058e8d18825281",
-                    "nonce" : "5ff36212e43b078e",
+                    "hash" : "0x0500c0cdc1f38b5ef6a05b5fd7fb45d4baf863cf7d7a8242731c62eee6b66413",
+                    "mixHash" : "0xa43634a3b75ba584c33827363a47987be99a5365b73d081e09c80fa945a2a1e6",
+                    "nonce" : "0xe35e32dba129cfe6",
                     "number" : "0x01",
-                    "parentHash" : "28923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebf",
-                    "receiptTrie" : "5d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7",
-                    "stateRoot" : "dc6f9f117d822962d2fb341b86fd1eae4c359d6b947d7263e7991363cfff32e3",
+                    "parentHash" : "0x28923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebf",
+                    "receiptTrie" : "0x5d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7",
+                    "stateRoot" : "0xdc6f9f117d822962d2fb341b86fd1eae4c359d6b947d7263e7991363cfff32e3",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a028923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc6f9f117d822962d2fb341b86fd1eae4c359d6b947d7263e7991363cfff32e3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0ff92080b34ec69745da823bfa2c6d6f7682cb26d69b2b66ee5058e8d18825281885ff36212e43b078ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a028923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc6f9f117d822962d2fb341b86fd1eae4c359d6b947d7263e7991363cfff32e3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0a43634a3b75ba584c33827363a47987be99a5365b73d081e09c80fa945a2a1e688e35e32dba129cfe6f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -467,102 +487,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "28923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebf",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x28923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "e051c05e9d63ad9156dec3d10659301ff16c8dcf28dfb3bd27f94d00d4b3ff80",
+        "lastblockhash" : "0x0500c0cdc1f38b5ef6a05b5fd7fb45d4baf863cf7d7a8242731c62eee6b66413",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcallcode_001_OOGMAfter_3_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcallcode_001_OOGMAfter_3_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0155fd",
+                    "hash" : "0x47b16a6bb1314a753da6f8a3c86cbaee5926b70c3ff442b34b701645f2635821",
+                    "mixHash" : "0xa07de193705e2b7c05b2276146aa3f43337e9c695ec0f818d818b2b5a0fab8da",
+                    "nonce" : "0xa3ed754a90f52e3d",
+                    "number" : "0x01",
+                    "parentHash" : "0x28923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebf",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0x51efc20ea24496e2c1b1dfb533701ece21a5ec3278113c62fa08bd3b6d462c0c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a028923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa051efc20ea24496e2c1b1dfb533701ece21a5ec3278113c62fa08bd3b6d462c0ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0a07de193705e2b7c05b2276146aa3f43337e9c695ec0f818d818b2b5a0fab8da88a3ed754a90f52e3df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x28923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x47b16a6bb1314a753da6f8a3c86cbaee5926b70c3ff442b34b701645f2635821",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555fd",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa03",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1_d0g0v0.json
index b9efade3a..1700196c7 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcodecall_010_OOGMAfter_1_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcodecall_010_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155f7",
-                    "hash" : "39ba5f5efe7f5477c463ba97e29515cec4faef621cc8cde4fe4644eebb5e2e05",
-                    "mixHash" : "589f734647e1107c9df87bf17ce6ae3e0c4374da157068229658609557973e4a",
-                    "nonce" : "90bbcffdd5604128",
+                    "hash" : "0xc1801f554083d09d32b965c0b90eb019910ee4004e18e7d18d5a3895218c8db5",
+                    "mixHash" : "0xdcc22db682d07b0ac9739e8ddc5a8a1d545b1b9e0717e6ae1bf6dce1a33f735d",
+                    "nonce" : "0x88118a4132c38b3e",
                     "number" : "0x01",
-                    "parentHash" : "49c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954",
-                    "receiptTrie" : "78de38a1cc5bc070882d75997e6524adaf261e428663c3ddd46b2518cec5fd84",
-                    "stateRoot" : "a95688229630019b545de2594ae92848cee2ece44c560b8a8982a050bd34e7a1",
+                    "parentHash" : "0x49c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954",
+                    "receiptTrie" : "0x78de38a1cc5bc070882d75997e6524adaf261e428663c3ddd46b2518cec5fd84",
+                    "stateRoot" : "0xa95688229630019b545de2594ae92848cee2ece44c560b8a8982a050bd34e7a1",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a049c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a95688229630019b545de2594ae92848cee2ece44c560b8a8982a050bd34e7a1a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea078de38a1cc5bc070882d75997e6524adaf261e428663c3ddd46b2518cec5fd84b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a0589f734647e1107c9df87bf17ce6ae3e0c4374da157068229658609557973e4a8890bbcffdd5604128f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a049c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a95688229630019b545de2594ae92848cee2ece44c560b8a8982a050bd34e7a1a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea078de38a1cc5bc070882d75997e6524adaf261e428663c3ddd46b2518cec5fd84b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a0dcc22db682d07b0ac9739e8ddc5a8a1d545b1b9e0717e6ae1bf6dce1a33f735d8888118a4132c38b3ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "49c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x49c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "1da92cef5f52af69c159d1a836ce44a8f6a7b7a4313e25f0a30c9884f52844b1",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1da92cef5f52af69c159d1a836ce44a8f6a7b7a4313e25f0a30c9884f52844b1",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01da92cef5f52af69c159d1a836ce44a8f6a7b7a4313e25f0a30c9884f52844b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "39ba5f5efe7f5477c463ba97e29515cec4faef621cc8cde4fe4644eebb5e2e05",
+        "lastblockhash" : "0xc1801f554083d09d32b965c0b90eb019910ee4004e18e7d18d5a3895218c8db5",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c8df46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555f7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa09",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c8df46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcallcodecall_010_OOGMAfter_1_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcodecall_010_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155f7",
-                    "hash" : "3ad9ddd7134d9f28be7d0fdb9f76d7842e88d4a28e69430c77deed8bf2b2af3e",
-                    "mixHash" : "ed4e1623062430e0576454340b4ecdfae729a4faae5043742e39bfe3004a8236",
-                    "nonce" : "fd6d128ea1419759",
+                    "hash" : "0xbd5684fc7b6893ad87aee41aa9a544247f4f860ded4df3b2a108c237607dbcd9",
+                    "mixHash" : "0x09c29c40358d44401d1a8536c221c577870ff052a67101921da9fe07d826ae46",
+                    "nonce" : "0x92ff5e9fd9bf89f3",
                     "number" : "0x01",
-                    "parentHash" : "49c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954",
-                    "receiptTrie" : "78de38a1cc5bc070882d75997e6524adaf261e428663c3ddd46b2518cec5fd84",
-                    "stateRoot" : "a95688229630019b545de2594ae92848cee2ece44c560b8a8982a050bd34e7a1",
+                    "parentHash" : "0x49c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954",
+                    "receiptTrie" : "0x78de38a1cc5bc070882d75997e6524adaf261e428663c3ddd46b2518cec5fd84",
+                    "stateRoot" : "0xa95688229630019b545de2594ae92848cee2ece44c560b8a8982a050bd34e7a1",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a049c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a95688229630019b545de2594ae92848cee2ece44c560b8a8982a050bd34e7a1a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea078de38a1cc5bc070882d75997e6524adaf261e428663c3ddd46b2518cec5fd84b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a0ed4e1623062430e0576454340b4ecdfae729a4faae5043742e39bfe3004a823688fd6d128ea1419759f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a049c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a95688229630019b545de2594ae92848cee2ece44c560b8a8982a050bd34e7a1a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea078de38a1cc5bc070882d75997e6524adaf261e428663c3ddd46b2518cec5fd84b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a009c29c40358d44401d1a8536c221c577870ff052a67101921da9fe07d826ae468892ff5e9fd9bf89f3f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "49c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x49c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "1da92cef5f52af69c159d1a836ce44a8f6a7b7a4313e25f0a30c9884f52844b1",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1da92cef5f52af69c159d1a836ce44a8f6a7b7a4313e25f0a30c9884f52844b1",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01da92cef5f52af69c159d1a836ce44a8f6a7b7a4313e25f0a30c9884f52844b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "3ad9ddd7134d9f28be7d0fdb9f76d7842e88d4a28e69430c77deed8bf2b2af3e",
+        "lastblockhash" : "0xbd5684fc7b6893ad87aee41aa9a544247f4f860ded4df3b2a108c237607dbcd9",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c8df46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555f7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa09",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c8df46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcallcodecall_010_OOGMAfter_1_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcodecall_010_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cd",
-                    "hash" : "2f1e39d3cfcc76d91aa407772182bfe5a41f965026ae3a7a9c45860bdcad442d",
-                    "mixHash" : "c26fb07ca73697b7120d6786662b666faee19fd1e5d98beb4d9ad3af12e81b32",
-                    "nonce" : "3959283d93fb2257",
+                    "hash" : "0x65b41055a1b78550ee48f9a2ab10c4c2a5cc3bb566c2f91a9ad5f43b39543758",
+                    "mixHash" : "0xa80f05f38d439de57328b3c084ac24ea04edaf681b4377c5009a38cf5662d3fe",
+                    "nonce" : "0x8712257e8069d1ca",
                     "number" : "0x01",
-                    "parentHash" : "49c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954",
-                    "receiptTrie" : "44ddc52220f9aee4b7a46e2b9211e884746bfed8b1f4c6af23d5f48c8e714be6",
-                    "stateRoot" : "d5def02563677036b2880a12575ce0e1cbaf250af631c9e1f792c6bea139ac0a",
+                    "parentHash" : "0x49c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954",
+                    "receiptTrie" : "0x44ddc52220f9aee4b7a46e2b9211e884746bfed8b1f4c6af23d5f48c8e714be6",
+                    "stateRoot" : "0xd5def02563677036b2880a12575ce0e1cbaf250af631c9e1f792c6bea139ac0a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a049c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5def02563677036b2880a12575ce0e1cbaf250af631c9e1f792c6bea139ac0aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea044ddc52220f9aee4b7a46e2b9211e884746bfed8b1f4c6af23d5f48c8e714be6b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cd8203e880a0c26fb07ca73697b7120d6786662b666faee19fd1e5d98beb4d9ad3af12e81b32883959283d93fb2257f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a049c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5def02563677036b2880a12575ce0e1cbaf250af631c9e1f792c6bea139ac0aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea044ddc52220f9aee4b7a46e2b9211e884746bfed8b1f4c6af23d5f48c8e714be6b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cd8203e880a0a80f05f38d439de57328b3c084ac24ea04edaf681b4377c5009a38cf5662d3fe888712257e8069d1caf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,102 +340,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "49c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x49c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "1da92cef5f52af69c159d1a836ce44a8f6a7b7a4313e25f0a30c9884f52844b1",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1da92cef5f52af69c159d1a836ce44a8f6a7b7a4313e25f0a30c9884f52844b1",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01da92cef5f52af69c159d1a836ce44a8f6a7b7a4313e25f0a30c9884f52844b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "2f1e39d3cfcc76d91aa407772182bfe5a41f965026ae3a7a9c45860bdcad442d",
+        "lastblockhash" : "0x65b41055a1b78550ee48f9a2ab10c4c2a5cc3bb566c2f91a9ad5f43b39543758",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c8df46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af33",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c8df46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -428,36 +443,41 @@
         }
     },
     "callcallcodecall_010_OOGMAfter_1_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcodecall_010_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cd",
-                    "hash" : "499db80256e99789cc7dc1c402a5981e68fdc4510b1b5f5aa1e67c36c5f2e5ae",
-                    "mixHash" : "76f67216669e5a74c5fd0b3b8f06ac708635bfa1d1c6fa82360bbe24030b83e4",
-                    "nonce" : "42dd307826b43ee1",
+                    "hash" : "0x0925d3f7fcd65844a4c9d70860ce955c8753242a0ed2ef705e3fd28cd753b799",
+                    "mixHash" : "0x69960ef525f8b6c07093a9a7c6e93da63fb1a390889f33fa4b196cfea3b066ec",
+                    "nonce" : "0xe59849bed69939e6",
                     "number" : "0x01",
-                    "parentHash" : "49c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954",
-                    "receiptTrie" : "44ddc52220f9aee4b7a46e2b9211e884746bfed8b1f4c6af23d5f48c8e714be6",
-                    "stateRoot" : "d5def02563677036b2880a12575ce0e1cbaf250af631c9e1f792c6bea139ac0a",
+                    "parentHash" : "0x49c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954",
+                    "receiptTrie" : "0x44ddc52220f9aee4b7a46e2b9211e884746bfed8b1f4c6af23d5f48c8e714be6",
+                    "stateRoot" : "0xd5def02563677036b2880a12575ce0e1cbaf250af631c9e1f792c6bea139ac0a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a049c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5def02563677036b2880a12575ce0e1cbaf250af631c9e1f792c6bea139ac0aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea044ddc52220f9aee4b7a46e2b9211e884746bfed8b1f4c6af23d5f48c8e714be6b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cd8203e880a076f67216669e5a74c5fd0b3b8f06ac708635bfa1d1c6fa82360bbe24030b83e48842dd307826b43ee1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a049c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5def02563677036b2880a12575ce0e1cbaf250af631c9e1f792c6bea139ac0aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea044ddc52220f9aee4b7a46e2b9211e884746bfed8b1f4c6af23d5f48c8e714be6b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cd8203e880a069960ef525f8b6c07093a9a7c6e93da63fb1a390889f33fa4b196cfea3b066ec88e59849bed69939e6f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -467,102 +487,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "49c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x49c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "1da92cef5f52af69c159d1a836ce44a8f6a7b7a4313e25f0a30c9884f52844b1",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1da92cef5f52af69c159d1a836ce44a8f6a7b7a4313e25f0a30c9884f52844b1",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01da92cef5f52af69c159d1a836ce44a8f6a7b7a4313e25f0a30c9884f52844b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "499db80256e99789cc7dc1c402a5981e68fdc4510b1b5f5aa1e67c36c5f2e5ae",
+        "lastblockhash" : "0x0925d3f7fcd65844a4c9d70860ce955c8753242a0ed2ef705e3fd28cd753b799",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c8df46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af33",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c8df46001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcodecall_010_OOGMAfter_1_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcodecall_010_OOGMAfter_1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0155f7",
+                    "hash" : "0x82440e765658b5c57a7a1e23321edf2e695fea9e0029464c558b0d64b375f42a",
+                    "mixHash" : "0x1a0c04cd3c2f68a9069d2b8facbd942c613124892ee2bada47607ddee093401e",
+                    "nonce" : "0xc40c8c31f32be7fe",
+                    "number" : "0x01",
+                    "parentHash" : "0x49c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954",
+                    "receiptTrie" : "0x7b32f6865ba11d16b4c8e757d35f80e1ea3ddb33d2b2fc644a01c5a2bbb5ba1f",
+                    "stateRoot" : "0x1439ceb9604bc56d8cdb171dc7392d211bc52611debca81e6877f7e17147b3b8",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a049c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01439ceb9604bc56d8cdb171dc7392d211bc52611debca81e6877f7e17147b3b8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07b32f6865ba11d16b4c8e757d35f80e1ea3ddb33d2b2fc644a01c5a2bbb5ba1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a01a0c04cd3c2f68a9069d2b8facbd942c613124892ee2bada47607ddee093401e88c40c8c31f32be7fef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x49c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x1da92cef5f52af69c159d1a836ce44a8f6a7b7a4313e25f0a30c9884f52844b1",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01da92cef5f52af69c159d1a836ce44a8f6a7b7a4313e25f0a30c9884f52844b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x82440e765658b5c57a7a1e23321edf2e695fea9e0029464c558b0d64b375f42a",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c8df46001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555f7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa09",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c8df46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2_d0g0v0.json
index 50969379b..7988a9df4 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcodecall_010_OOGMAfter_2_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcodecall_010_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fa",
-                    "hash" : "b4c631f72f19aada99325f09a7843bc0d8cbde11229f85b4b92caaa0411c0e1a",
-                    "mixHash" : "0e0f0ab7405104f9f6b0638ea479459078c8546c480364a89c330d49f6b9e9d4",
-                    "nonce" : "8718145dcbe10f49",
+                    "hash" : "0x2c53bb788ddf704bef70b8acb83aaa44b719a55056805d1ea68c9ee587a7e1e9",
+                    "mixHash" : "0x44256bd4e28373aaa9ebc7e056e54c184ccfb220a00eaea7f81241e64160a915",
+                    "nonce" : "0x23783b10be05f0f3",
                     "number" : "0x01",
-                    "parentHash" : "bdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1",
-                    "receiptTrie" : "bd7e197e7c7b7a4151fb5cd1489db68e3588f8ad2385eebec6c1969ae1135167",
-                    "stateRoot" : "ebbbc3894ac249db61ccff3928947f432ce0c708113d34c31af26c9d9d5d0ac8",
+                    "parentHash" : "0xbdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1",
+                    "receiptTrie" : "0xbd7e197e7c7b7a4151fb5cd1489db68e3588f8ad2385eebec6c1969ae1135167",
+                    "stateRoot" : "0xebbbc3894ac249db61ccff3928947f432ce0c708113d34c31af26c9d9d5d0ac8",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ebbbc3894ac249db61ccff3928947f432ce0c708113d34c31af26c9d9d5d0ac8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0bd7e197e7c7b7a4151fb5cd1489db68e3588f8ad2385eebec6c1969ae1135167b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a00e0f0ab7405104f9f6b0638ea479459078c8546c480364a89c330d49f6b9e9d4888718145dcbe10f49f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0bdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ebbbc3894ac249db61ccff3928947f432ce0c708113d34c31af26c9d9d5d0ac8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0bd7e197e7c7b7a4151fb5cd1489db68e3588f8ad2385eebec6c1969ae1135167b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a044256bd4e28373aaa9ebc7e056e54c184ccfb220a00eaea7f81241e64160a9158823783b10be05f0f3f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "bdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xbdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "29847014ff20846c4c66e79efef3203b68ae69e0c72c0ce17e14417766d227f7",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x29847014ff20846c4c66e79efef3203b68ae69e0c72c0ce17e14417766d227f7",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029847014ff20846c4c66e79efef3203b68ae69e0c72c0ce17e14417766d227f7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b4c631f72f19aada99325f09a7843bc0d8cbde11229f85b4b92caaa0411c0e1a",
+        "lastblockhash" : "0x2c53bb788ddf704bef70b8acb83aaa44b719a55056805d1ea68c9ee587a7e1e9",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e48f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fa",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa06",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e48f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcallcodecall_010_OOGMAfter_2_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcodecall_010_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fa",
-                    "hash" : "71a6cd25d041f65d32521adc834d33b79d76cbcb212b163a45d4a37696bb57f7",
-                    "mixHash" : "c03dcf0fa1d5ff6668e715dd1a6277f9b44fd8a7b399f645e0253bd4b7ed1413",
-                    "nonce" : "a034c56e3af6f55f",
+                    "hash" : "0x5fbfc50584ef663209518711720ad7d91690e244ac27f992c1186cce30ac409c",
+                    "mixHash" : "0xebbbf7bcc8826b1170b739bf615f8d53b33c114f084c13d048a968bbccadebad",
+                    "nonce" : "0x24c320520dc59ea0",
                     "number" : "0x01",
-                    "parentHash" : "bdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1",
-                    "receiptTrie" : "bd7e197e7c7b7a4151fb5cd1489db68e3588f8ad2385eebec6c1969ae1135167",
-                    "stateRoot" : "ebbbc3894ac249db61ccff3928947f432ce0c708113d34c31af26c9d9d5d0ac8",
+                    "parentHash" : "0xbdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1",
+                    "receiptTrie" : "0xbd7e197e7c7b7a4151fb5cd1489db68e3588f8ad2385eebec6c1969ae1135167",
+                    "stateRoot" : "0xebbbc3894ac249db61ccff3928947f432ce0c708113d34c31af26c9d9d5d0ac8",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ebbbc3894ac249db61ccff3928947f432ce0c708113d34c31af26c9d9d5d0ac8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0bd7e197e7c7b7a4151fb5cd1489db68e3588f8ad2385eebec6c1969ae1135167b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a0c03dcf0fa1d5ff6668e715dd1a6277f9b44fd8a7b399f645e0253bd4b7ed141388a034c56e3af6f55ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0bdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ebbbc3894ac249db61ccff3928947f432ce0c708113d34c31af26c9d9d5d0ac8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0bd7e197e7c7b7a4151fb5cd1489db68e3588f8ad2385eebec6c1969ae1135167b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a0ebbbf7bcc8826b1170b739bf615f8d53b33c114f084c13d048a968bbccadebad8824c320520dc59ea0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "bdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xbdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "29847014ff20846c4c66e79efef3203b68ae69e0c72c0ce17e14417766d227f7",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x29847014ff20846c4c66e79efef3203b68ae69e0c72c0ce17e14417766d227f7",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029847014ff20846c4c66e79efef3203b68ae69e0c72c0ce17e14417766d227f7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "71a6cd25d041f65d32521adc834d33b79d76cbcb212b163a45d4a37696bb57f7",
+        "lastblockhash" : "0x5fbfc50584ef663209518711720ad7d91690e244ac27f992c1186cce30ac409c",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e48f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fa",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa06",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e48f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcallcodecall_010_OOGMAfter_2_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcodecall_010_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "404eb8f322484f3791148247c447e792450899e911cdbcf9858c6aa4b280b010",
-                    "mixHash" : "d6403bdb9898a32e3cc36740db879f2b36c136a94b3ca72229c1fb4a0daae509",
-                    "nonce" : "e9ad7b5270fb518a",
+                    "hash" : "0x196457e4190c493880fec9844229e3c1d8e3b3b26e77bb3cde948350ed3e5041",
+                    "mixHash" : "0x0d0324698eefc3a513903e3c06e77bdeb0f92928028c717bb46c1b5d11cfe3b5",
+                    "nonce" : "0xe6a0a42ebbf12ae9",
                     "number" : "0x01",
-                    "parentHash" : "bdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1",
-                    "receiptTrie" : "553904f2b8cb6646c17757546024e0702f9a6a9c91e390fa3542ceed6b7c9b48",
-                    "stateRoot" : "b8f0f735f1f064b58dad849bdb74e2c2a8037285d2434905dfaad343a16902a9",
+                    "parentHash" : "0xbdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1",
+                    "receiptTrie" : "0x553904f2b8cb6646c17757546024e0702f9a6a9c91e390fa3542ceed6b7c9b48",
+                    "stateRoot" : "0xb8f0f735f1f064b58dad849bdb74e2c2a8037285d2434905dfaad343a16902a9",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8f0f735f1f064b58dad849bdb74e2c2a8037285d2434905dfaad343a16902a9a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0553904f2b8cb6646c17757546024e0702f9a6a9c91e390fa3542ceed6b7c9b48b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0d6403bdb9898a32e3cc36740db879f2b36c136a94b3ca72229c1fb4a0daae50988e9ad7b5270fb518af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0bdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8f0f735f1f064b58dad849bdb74e2c2a8037285d2434905dfaad343a16902a9a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0553904f2b8cb6646c17757546024e0702f9a6a9c91e390fa3542ceed6b7c9b48b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a00d0324698eefc3a513903e3c06e77bdeb0f92928028c717bb46c1b5d11cfe3b588e6a0a42ebbf12ae9f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,102 +340,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "bdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xbdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "29847014ff20846c4c66e79efef3203b68ae69e0c72c0ce17e14417766d227f7",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x29847014ff20846c4c66e79efef3203b68ae69e0c72c0ce17e14417766d227f7",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029847014ff20846c4c66e79efef3203b68ae69e0c72c0ce17e14417766d227f7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "404eb8f322484f3791148247c447e792450899e911cdbcf9858c6aa4b280b010",
+        "lastblockhash" : "0x196457e4190c493880fec9844229e3c1d8e3b3b26e77bb3cde948350ed3e5041",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e48f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e48f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -428,36 +443,41 @@
         }
     },
     "callcallcodecall_010_OOGMAfter_2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcodecall_010_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "14539a4d15ce8e878b1e90d6c6de3eacb7753a26a5be09f713521c897f307202",
-                    "mixHash" : "2aa878b0e1fdbbfd2f598a781f06ec305ed68e32cba1906d5f7c247f0da42952",
-                    "nonce" : "839db572a2cf37b7",
+                    "hash" : "0x852278178a8a49212eb525d5dd48f9d7f1544b9e2bd3fe3323862293c206478b",
+                    "mixHash" : "0x1182fd22293da58b4f66e6d5f0968ec909c655bc7035e22fae4aecb14e9aab03",
+                    "nonce" : "0x315f39b04ef07c5c",
                     "number" : "0x01",
-                    "parentHash" : "bdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1",
-                    "receiptTrie" : "553904f2b8cb6646c17757546024e0702f9a6a9c91e390fa3542ceed6b7c9b48",
-                    "stateRoot" : "b8f0f735f1f064b58dad849bdb74e2c2a8037285d2434905dfaad343a16902a9",
+                    "parentHash" : "0xbdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1",
+                    "receiptTrie" : "0x553904f2b8cb6646c17757546024e0702f9a6a9c91e390fa3542ceed6b7c9b48",
+                    "stateRoot" : "0xb8f0f735f1f064b58dad849bdb74e2c2a8037285d2434905dfaad343a16902a9",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8f0f735f1f064b58dad849bdb74e2c2a8037285d2434905dfaad343a16902a9a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0553904f2b8cb6646c17757546024e0702f9a6a9c91e390fa3542ceed6b7c9b48b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a02aa878b0e1fdbbfd2f598a781f06ec305ed68e32cba1906d5f7c247f0da4295288839db572a2cf37b7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0bdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8f0f735f1f064b58dad849bdb74e2c2a8037285d2434905dfaad343a16902a9a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0553904f2b8cb6646c17757546024e0702f9a6a9c91e390fa3542ceed6b7c9b48b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a01182fd22293da58b4f66e6d5f0968ec909c655bc7035e22fae4aecb14e9aab0388315f39b04ef07c5cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -467,102 +487,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "bdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xbdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "29847014ff20846c4c66e79efef3203b68ae69e0c72c0ce17e14417766d227f7",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x29847014ff20846c4c66e79efef3203b68ae69e0c72c0ce17e14417766d227f7",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029847014ff20846c4c66e79efef3203b68ae69e0c72c0ce17e14417766d227f7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "14539a4d15ce8e878b1e90d6c6de3eacb7753a26a5be09f713521c897f307202",
+        "lastblockhash" : "0x852278178a8a49212eb525d5dd48f9d7f1544b9e2bd3fe3323862293c206478b",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e48f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e48f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcodecall_010_OOGMAfter_2_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcodecall_010_OOGMAfter_2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0155fa",
+                    "hash" : "0x21d3ecaadf822f1ebf27923dc8b065a85c58fab9a0b15f8cc0e3b23a1bb43cb5",
+                    "mixHash" : "0xf60bb30590a3e83a5f9e6df338ad849f262d085c4b534cfc217036ee379b2973",
+                    "nonce" : "0x6a6181ef6e3ba5b7",
+                    "number" : "0x01",
+                    "parentHash" : "0xbdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1",
+                    "receiptTrie" : "0x9c15c271a51ae8f1007b852a5c63f8adccff1dafb06f5a58921c871c65abaff9",
+                    "stateRoot" : "0xe2c8c9d19e7f7a0f12b54f5277105a3659fb25b5bdaf953ae60cda2462acb900",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0bdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2c8c9d19e7f7a0f12b54f5277105a3659fb25b5bdaf953ae60cda2462acb900a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09c15c271a51ae8f1007b852a5c63f8adccff1dafb06f5a58921c871c65abaff9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a0f60bb30590a3e83a5f9e6df338ad849f262d085c4b534cfc217036ee379b2973886a6181ef6e3ba5b7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xbdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x29847014ff20846c4c66e79efef3203b68ae69e0c72c0ce17e14417766d227f7",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029847014ff20846c4c66e79efef3203b68ae69e0c72c0ce17e14417766d227f7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x21d3ecaadf822f1ebf27923dc8b065a85c58fab9a0b15f8cc0e3b23a1bb43cb5",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e48f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa06",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e48f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3_d0g0v0.json
index 6c442df58..e0e6a2c2a 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcodecall_010_OOGMAfter_3_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcodecall_010_OOGMAfter_3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "c784d6ca6876497ea94b2039b13b8200a84ab4c57dddab2d689f6d10decdab4e",
-                    "mixHash" : "f0d174deef9f98d148535a66a775bffbe9ef73666aee7ef79917509470c10e45",
-                    "nonce" : "5f81807211e880dc",
+                    "hash" : "0x22dbd38599c341017cafa3830af90c3c555cb0cd94038a9b1a522b12c910ca75",
+                    "mixHash" : "0xc145cb7ffcc60fa261532924cf472bf92a5fd205e65356f4f4d73dbb478b319c",
+                    "nonce" : "0x7b9442c66a488935",
                     "number" : "0x01",
-                    "parentHash" : "82f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75",
-                    "receiptTrie" : "c4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882",
-                    "stateRoot" : "830d27f797a440c9b2c72b9409662e71e3ed9e4f565e40b802b86445e3b3f7ca",
+                    "parentHash" : "0x82f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75",
+                    "receiptTrie" : "0xc4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882",
+                    "stateRoot" : "0x830d27f797a440c9b2c72b9409662e71e3ed9e4f565e40b802b86445e3b3f7ca",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a082f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0830d27f797a440c9b2c72b9409662e71e3ed9e4f565e40b802b86445e3b3f7caa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0f0d174deef9f98d148535a66a775bffbe9ef73666aee7ef79917509470c10e45885f81807211e880dcf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a082f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0830d27f797a440c9b2c72b9409662e71e3ed9e4f565e40b802b86445e3b3f7caa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0c145cb7ffcc60fa261532924cf472bf92a5fd205e65356f4f4d73dbb478b319c887b9442c66a488935f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "82f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x82f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c784d6ca6876497ea94b2039b13b8200a84ab4c57dddab2d689f6d10decdab4e",
+        "lastblockhash" : "0x22dbd38599c341017cafa3830af90c3c555cb0cd94038a9b1a522b12c910ca75",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcallcodecall_010_OOGMAfter_3_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcodecall_010_OOGMAfter_3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "589a2f01c069dc923237cd7ea33ae65e6f6df1f4b4ab61cd8efc4bd572458820",
-                    "mixHash" : "c8f90564fbd849b4e4b0d5001c7864df4488a2cf569c119027aeab6983781273",
-                    "nonce" : "1d1fd43667ddb42f",
+                    "hash" : "0x4bdd62020ed2230558d87419ba9794236805904f047e103e59ce48817318c37d",
+                    "mixHash" : "0xae4b6785155701dd88abfdbe2a38bff90b2faa4db018fdb6e9a0c9e0e2edf67a",
+                    "nonce" : "0x618808d639aedbdc",
                     "number" : "0x01",
-                    "parentHash" : "82f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75",
-                    "receiptTrie" : "c4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882",
-                    "stateRoot" : "830d27f797a440c9b2c72b9409662e71e3ed9e4f565e40b802b86445e3b3f7ca",
+                    "parentHash" : "0x82f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75",
+                    "receiptTrie" : "0xc4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882",
+                    "stateRoot" : "0x830d27f797a440c9b2c72b9409662e71e3ed9e4f565e40b802b86445e3b3f7ca",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a082f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0830d27f797a440c9b2c72b9409662e71e3ed9e4f565e40b802b86445e3b3f7caa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0c8f90564fbd849b4e4b0d5001c7864df4488a2cf569c119027aeab6983781273881d1fd43667ddb42ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a082f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0830d27f797a440c9b2c72b9409662e71e3ed9e4f565e40b802b86445e3b3f7caa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0ae4b6785155701dd88abfdbe2a38bff90b2faa4db018fdb6e9a0c9e0e2edf67a88618808d639aedbdcf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "82f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x82f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "589a2f01c069dc923237cd7ea33ae65e6f6df1f4b4ab61cd8efc4bd572458820",
+        "lastblockhash" : "0x4bdd62020ed2230558d87419ba9794236805904f047e103e59ce48817318c37d",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcallcodecall_010_OOGMAfter_3_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcodecall_010_OOGMAfter_3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "2f16e3afae861dd6c8858b9b89e04f602de14c3ff234817203a45d92ceef36d6",
-                    "mixHash" : "e63957304c4ef92002b03b049689a51bff5d69fa13dd1b0c4e57c05abe47a6ff",
-                    "nonce" : "906933c697025e7c",
+                    "hash" : "0xd24a9ad345567ca9ecefd780e79ca17829f709234086a55c157ea02be42fadec",
+                    "mixHash" : "0x6cb6c1c505c453982547101496abf001be39d3b146188928740463c9cddc7bd0",
+                    "nonce" : "0x1e811093b21ce9c0",
                     "number" : "0x01",
-                    "parentHash" : "82f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75",
-                    "receiptTrie" : "8894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189",
-                    "stateRoot" : "edf9c6b0f9ebfb3d85af1dacbecab6d70bd5bec19c30e95ec2de1acb3ff82602",
+                    "parentHash" : "0x82f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75",
+                    "receiptTrie" : "0x8894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189",
+                    "stateRoot" : "0xedf9c6b0f9ebfb3d85af1dacbecab6d70bd5bec19c30e95ec2de1acb3ff82602",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a082f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edf9c6b0f9ebfb3d85af1dacbecab6d70bd5bec19c30e95ec2de1acb3ff82602a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0e63957304c4ef92002b03b049689a51bff5d69fa13dd1b0c4e57c05abe47a6ff88906933c697025e7cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a082f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edf9c6b0f9ebfb3d85af1dacbecab6d70bd5bec19c30e95ec2de1acb3ff82602a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a06cb6c1c505c453982547101496abf001be39d3b146188928740463c9cddc7bd0881e811093b21ce9c0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,102 +340,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "82f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x82f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "2f16e3afae861dd6c8858b9b89e04f602de14c3ff234817203a45d92ceef36d6",
+        "lastblockhash" : "0xd24a9ad345567ca9ecefd780e79ca17829f709234086a55c157ea02be42fadec",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -428,36 +443,41 @@
         }
     },
     "callcallcodecall_010_OOGMAfter_3_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcodecall_010_OOGMAfter_3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "cd64146f46c952c9dc501d798742bb88e9931522607e2cbdc9ec330d0de215f4",
-                    "mixHash" : "848b4561b16f5fdbe7135c94f4cbb06833fd4777a6e15e141f4a1bcc26be7615",
-                    "nonce" : "e0b9706e96169c6a",
+                    "hash" : "0x7bb37168c479575d1993c6d3fca876abc6a14e8db9f4dc9c6ef3f5dfa3cfabc9",
+                    "mixHash" : "0xa34916b799e5e888e7dce62ef92b9ba7697a86e63fa30df5148b4a2bb8476e0b",
+                    "nonce" : "0xa6891c816f79a6b7",
                     "number" : "0x01",
-                    "parentHash" : "82f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75",
-                    "receiptTrie" : "8894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189",
-                    "stateRoot" : "edf9c6b0f9ebfb3d85af1dacbecab6d70bd5bec19c30e95ec2de1acb3ff82602",
+                    "parentHash" : "0x82f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75",
+                    "receiptTrie" : "0x8894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189",
+                    "stateRoot" : "0xedf9c6b0f9ebfb3d85af1dacbecab6d70bd5bec19c30e95ec2de1acb3ff82602",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a082f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edf9c6b0f9ebfb3d85af1dacbecab6d70bd5bec19c30e95ec2de1acb3ff82602a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0848b4561b16f5fdbe7135c94f4cbb06833fd4777a6e15e141f4a1bcc26be761588e0b9706e96169c6af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a082f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edf9c6b0f9ebfb3d85af1dacbecab6d70bd5bec19c30e95ec2de1acb3ff82602a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0a34916b799e5e888e7dce62ef92b9ba7697a86e63fa30df5148b4a2bb8476e0b88a6891c816f79a6b7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -467,102 +487,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "82f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x82f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "cd64146f46c952c9dc501d798742bb88e9931522607e2cbdc9ec330d0de215f4",
+        "lastblockhash" : "0x7bb37168c479575d1993c6d3fca876abc6a14e8db9f4dc9c6ef3f5dfa3cfabc9",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcodecall_010_OOGMAfter_3_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcodecall_010_OOGMAfter_3_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0155fd",
+                    "hash" : "0xa7b6c4361d0a203cdb5b8a9e078e1074d8497f0f5a3ac72198ee562ba8795d95",
+                    "mixHash" : "0x1adc97d88dec94f84b5fdb7b7b9a98f52d780c0d420c42125720d0bfacd2de42",
+                    "nonce" : "0x536645f9736d7cca",
+                    "number" : "0x01",
+                    "parentHash" : "0x82f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0xa02a6675f97f0fb58ed49b3dee17102caab53d2a34392fd9522dd49a8ab85e99",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a082f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a02a6675f97f0fb58ed49b3dee17102caab53d2a34392fd9522dd49a8ab85e99a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a01adc97d88dec94f84b5fdb7b7b9a98f52d780c0d420c42125720d0bfacd2de4288536645f9736d7ccaf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x82f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa7b6c4361d0a203cdb5b8a9e078e1074d8497f0f5a3ac72198ee562ba8795d95",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555fd",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa03",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1_d0g0v0.json
index c4f1f7b42..530d6eb61 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcodecallcode_011_OOGMAfter_1_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fa",
-                    "hash" : "2a232a0fd18c79978d08696454150683804bb1496f9e79f9ad6040b23dd59399",
-                    "mixHash" : "bb7f733b0260ebc8b1777f6799dd84fe4a28a317ab1cd062df660218febb0195",
-                    "nonce" : "c74bd77077cf903b",
+                    "hash" : "0xc66a5c1b25236cd7bb64714272dfd3aa27046fc02926a63498b73a35507b5308",
+                    "mixHash" : "0xb4ad26d6f0268f3d8a5fdebe4101cb913ae9eb93f32472afd767072b4276c3a9",
+                    "nonce" : "0x711a9670ff12ebfd",
                     "number" : "0x01",
-                    "parentHash" : "699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94",
-                    "receiptTrie" : "8f9151c00aba9cf4567804c0c410ac8990a628e7b3cb2ca95fc821e15848832b",
-                    "stateRoot" : "8aea858c4bb00d16914b04f4b833081de53d1972d9d8b8bfbe388c8b6ce0ce85",
+                    "parentHash" : "0x699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94",
+                    "receiptTrie" : "0x8f9151c00aba9cf4567804c0c410ac8990a628e7b3cb2ca95fc821e15848832b",
+                    "stateRoot" : "0x8aea858c4bb00d16914b04f4b833081de53d1972d9d8b8bfbe388c8b6ce0ce85",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08aea858c4bb00d16914b04f4b833081de53d1972d9d8b8bfbe388c8b6ce0ce85a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08f9151c00aba9cf4567804c0c410ac8990a628e7b3cb2ca95fc821e15848832bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a0bb7f733b0260ebc8b1777f6799dd84fe4a28a317ab1cd062df660218febb019588c74bd77077cf903bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08aea858c4bb00d16914b04f4b833081de53d1972d9d8b8bfbe388c8b6ce0ce85a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08f9151c00aba9cf4567804c0c410ac8990a628e7b3cb2ca95fc821e15848832bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a0b4ad26d6f0268f3d8a5fdebe4101cb913ae9eb93f32472afd767072b4276c3a988711a9670ff12ebfdf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "5b5f01247ffe466cfcfe70f56caffd8c9ed9e9058b6458199160d7f6e66c6443",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5b5f01247ffe466cfcfe70f56caffd8c9ed9e9058b6458199160d7f6e66c6443",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b5f01247ffe466cfcfe70f56caffd8c9ed9e9058b6458199160d7f6e66c6443a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "2a232a0fd18c79978d08696454150683804bb1496f9e79f9ad6040b23dd59399",
+        "lastblockhash" : "0xc66a5c1b25236cd7bb64714272dfd3aa27046fc02926a63498b73a35507b5308",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaecf1600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fa",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa06",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaecf1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcallcodecallcode_011_OOGMAfter_1_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fa",
-                    "hash" : "4e38f266f921d5d65b8bab051360a854a97ce66f2d2eaa70ba7fc87dbc5e08da",
-                    "mixHash" : "a2024c5c008da31efc6557b4c89f106c241a205733b29ac447e52e1d3fee4046",
-                    "nonce" : "b29d3bb0db19987a",
+                    "hash" : "0x47d83596c73d58c7a154ae14957e76518d0b1076dda852e129c7371208edc68a",
+                    "mixHash" : "0x143101f9549bc684f2fd74e6807a1410d8947ecf76de0078d606ff02208e83b1",
+                    "nonce" : "0xfedb64383d904177",
                     "number" : "0x01",
-                    "parentHash" : "699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94",
-                    "receiptTrie" : "8f9151c00aba9cf4567804c0c410ac8990a628e7b3cb2ca95fc821e15848832b",
-                    "stateRoot" : "8aea858c4bb00d16914b04f4b833081de53d1972d9d8b8bfbe388c8b6ce0ce85",
+                    "parentHash" : "0x699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94",
+                    "receiptTrie" : "0x8f9151c00aba9cf4567804c0c410ac8990a628e7b3cb2ca95fc821e15848832b",
+                    "stateRoot" : "0x8aea858c4bb00d16914b04f4b833081de53d1972d9d8b8bfbe388c8b6ce0ce85",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08aea858c4bb00d16914b04f4b833081de53d1972d9d8b8bfbe388c8b6ce0ce85a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08f9151c00aba9cf4567804c0c410ac8990a628e7b3cb2ca95fc821e15848832bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a0a2024c5c008da31efc6557b4c89f106c241a205733b29ac447e52e1d3fee404688b29d3bb0db19987af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08aea858c4bb00d16914b04f4b833081de53d1972d9d8b8bfbe388c8b6ce0ce85a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08f9151c00aba9cf4567804c0c410ac8990a628e7b3cb2ca95fc821e15848832bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a0143101f9549bc684f2fd74e6807a1410d8947ecf76de0078d606ff02208e83b188fedb64383d904177f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "5b5f01247ffe466cfcfe70f56caffd8c9ed9e9058b6458199160d7f6e66c6443",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5b5f01247ffe466cfcfe70f56caffd8c9ed9e9058b6458199160d7f6e66c6443",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b5f01247ffe466cfcfe70f56caffd8c9ed9e9058b6458199160d7f6e66c6443a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "4e38f266f921d5d65b8bab051360a854a97ce66f2d2eaa70ba7fc87dbc5e08da",
+        "lastblockhash" : "0x47d83596c73d58c7a154ae14957e76518d0b1076dda852e129c7371208edc68a",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaecf1600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fa",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa06",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaecf1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcallcodecallcode_011_OOGMAfter_1_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150c2",
-                    "hash" : "59a33689c3829df65ab52a62b3a9a606689e6164cc69a94e5b1db2d6542b5cb6",
-                    "mixHash" : "60142b2fdec734054687f1cd4bf41d42dc84bfa50b1d188f08243d22d15befb1",
-                    "nonce" : "e6275ecc2941dcb2",
+                    "hash" : "0xb8ac38aaaef32f3936772da4e995b78333557a6989a61ab44d3ae8e86a9e84ba",
+                    "mixHash" : "0xc31d2b8af85e2017cf68520e11f1cb10d9b554695a6dfa1b402e479c67dfd1c4",
+                    "nonce" : "0x0c827c955d2c52ab",
                     "number" : "0x01",
-                    "parentHash" : "699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94",
-                    "receiptTrie" : "8b7f34d5fcdd86ab4dea0c01576ef6b0ebc111228f443d9494479875650a39ca",
-                    "stateRoot" : "a01db5ebd94f8300aaf0af219961f63aa6169016d4c5b75ae04c28a123e5db61",
+                    "parentHash" : "0x699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94",
+                    "receiptTrie" : "0x8b7f34d5fcdd86ab4dea0c01576ef6b0ebc111228f443d9494479875650a39ca",
+                    "stateRoot" : "0xa01db5ebd94f8300aaf0af219961f63aa6169016d4c5b75ae04c28a123e5db61",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a01db5ebd94f8300aaf0af219961f63aa6169016d4c5b75ae04c28a123e5db61a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08b7f34d5fcdd86ab4dea0c01576ef6b0ebc111228f443d9494479875650a39cab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c28203e880a060142b2fdec734054687f1cd4bf41d42dc84bfa50b1d188f08243d22d15befb188e6275ecc2941dcb2f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a01db5ebd94f8300aaf0af219961f63aa6169016d4c5b75ae04c28a123e5db61a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08b7f34d5fcdd86ab4dea0c01576ef6b0ebc111228f443d9494479875650a39cab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c28203e880a0c31d2b8af85e2017cf68520e11f1cb10d9b554695a6dfa1b402e479c67dfd1c4880c827c955d2c52abf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,102 +340,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "5b5f01247ffe466cfcfe70f56caffd8c9ed9e9058b6458199160d7f6e66c6443",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5b5f01247ffe466cfcfe70f56caffd8c9ed9e9058b6458199160d7f6e66c6443",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b5f01247ffe466cfcfe70f56caffd8c9ed9e9058b6458199160d7f6e66c6443a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "59a33689c3829df65ab52a62b3a9a606689e6164cc69a94e5b1db2d6542b5cb6",
+        "lastblockhash" : "0xb8ac38aaaef32f3936772da4e995b78333557a6989a61ab44d3ae8e86a9e84ba",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaecf1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550c2",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af3e",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaecf1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -428,36 +443,41 @@
         }
     },
     "callcallcodecallcode_011_OOGMAfter_1_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150c2",
-                    "hash" : "fdb4573db1b3f9aa4041804092009d4f249ea5b8edc4d8300183a81109117bc9",
-                    "mixHash" : "420c051e8fe6a39d7537e1a701ee7b3f16bdd339e48da156a61652afc1cefeac",
-                    "nonce" : "cebf65107cae93b9",
+                    "hash" : "0x6536abc8e4e2f32f35c8927a7c263e2a591f315cf357fd526fea2af08cd72341",
+                    "mixHash" : "0x5cb8a855d0b2fcd4489b31dc0ae8257ac06ee92e6f9796cbb46b33b45c2c48c4",
+                    "nonce" : "0xa3edf1ecbb370d5f",
                     "number" : "0x01",
-                    "parentHash" : "699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94",
-                    "receiptTrie" : "8b7f34d5fcdd86ab4dea0c01576ef6b0ebc111228f443d9494479875650a39ca",
-                    "stateRoot" : "a01db5ebd94f8300aaf0af219961f63aa6169016d4c5b75ae04c28a123e5db61",
+                    "parentHash" : "0x699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94",
+                    "receiptTrie" : "0x8b7f34d5fcdd86ab4dea0c01576ef6b0ebc111228f443d9494479875650a39ca",
+                    "stateRoot" : "0xa01db5ebd94f8300aaf0af219961f63aa6169016d4c5b75ae04c28a123e5db61",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a01db5ebd94f8300aaf0af219961f63aa6169016d4c5b75ae04c28a123e5db61a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08b7f34d5fcdd86ab4dea0c01576ef6b0ebc111228f443d9494479875650a39cab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c28203e880a0420c051e8fe6a39d7537e1a701ee7b3f16bdd339e48da156a61652afc1cefeac88cebf65107cae93b9f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a01db5ebd94f8300aaf0af219961f63aa6169016d4c5b75ae04c28a123e5db61a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08b7f34d5fcdd86ab4dea0c01576ef6b0ebc111228f443d9494479875650a39cab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c28203e880a05cb8a855d0b2fcd4489b31dc0ae8257ac06ee92e6f9796cbb46b33b45c2c48c488a3edf1ecbb370d5ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -467,102 +487,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "5b5f01247ffe466cfcfe70f56caffd8c9ed9e9058b6458199160d7f6e66c6443",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5b5f01247ffe466cfcfe70f56caffd8c9ed9e9058b6458199160d7f6e66c6443",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b5f01247ffe466cfcfe70f56caffd8c9ed9e9058b6458199160d7f6e66c6443a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "fdb4573db1b3f9aa4041804092009d4f249ea5b8edc4d8300183a81109117bc9",
+        "lastblockhash" : "0x6536abc8e4e2f32f35c8927a7c263e2a591f315cf357fd526fea2af08cd72341",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaecf1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550c2",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af3e",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaecf1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcodecallcode_011_OOGMAfter_1_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0155fa",
+                    "hash" : "0x5e962503467a045fdd03814fbfb96c098ac5bd1300a6e7265145e3e0857c8d2f",
+                    "mixHash" : "0xe0b9a46808bf75bef4b8e7ef12be7100b6913f8b6034f82d37c1e7856dde6ebc",
+                    "nonce" : "0x4ee1475199ec905f",
+                    "number" : "0x01",
+                    "parentHash" : "0x699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94",
+                    "receiptTrie" : "0x9c15c271a51ae8f1007b852a5c63f8adccff1dafb06f5a58921c871c65abaff9",
+                    "stateRoot" : "0x56b6f0b98a6585b38b6f51914d5901427d7ba7262332d16dd6c1c2a5bcc6efd3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa056b6f0b98a6585b38b6f51914d5901427d7ba7262332d16dd6c1c2a5bcc6efd3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09c15c271a51ae8f1007b852a5c63f8adccff1dafb06f5a58921c871c65abaff9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a0e0b9a46808bf75bef4b8e7ef12be7100b6913f8b6034f82d37c1e7856dde6ebc884ee1475199ec905ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x5b5f01247ffe466cfcfe70f56caffd8c9ed9e9058b6458199160d7f6e66c6443",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b5f01247ffe466cfcfe70f56caffd8c9ed9e9058b6458199160d7f6e66c6443a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x5e962503467a045fdd03814fbfb96c098ac5bd1300a6e7265145e3e0857c8d2f",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaecf1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa06",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaecf1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2_d0g0v0.json
index 53b07a9c2..c73736ae8 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcallcodecallcode_011_OOGMAfter_2_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "7ad0c45d4c7425fd1e4b76e65eb2fe172e9b7700a7e9ed25ea226c96cf064b3b",
-                    "mixHash" : "572a1ce8cc0cd3e1b0042ef8117a725baadb4a93f4cc722d420eef12e6b1fc61",
-                    "nonce" : "c0e5d5f68358251e",
+                    "hash" : "0x983e75e8fec53cd5fd74f030ecb78c7a1bc4b3a100043ef0ae740fdc496e3aac",
+                    "mixHash" : "0x184ea4ac1e1aed2c21153ff55666771cc766c7c06bb3086cafb169108bee27b0",
+                    "nonce" : "0x9604ed88e805144c",
                     "number" : "0x01",
-                    "parentHash" : "f46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3a",
-                    "receiptTrie" : "782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5",
-                    "stateRoot" : "306c6dacbf5b92095477a3ea1801ed1bf9d5e1c6740c1311331b4b88dca18b28",
+                    "parentHash" : "0xf46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3a",
+                    "receiptTrie" : "0x782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5",
+                    "stateRoot" : "0x306c6dacbf5b92095477a3ea1801ed1bf9d5e1c6740c1311331b4b88dca18b28",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0f46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0306c6dacbf5b92095477a3ea1801ed1bf9d5e1c6740c1311331b4b88dca18b28a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0572a1ce8cc0cd3e1b0042ef8117a725baadb4a93f4cc722d420eef12e6b1fc6188c0e5d5f68358251ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0f46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0306c6dacbf5b92095477a3ea1801ed1bf9d5e1c6740c1311331b4b88dca18b28a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0184ea4ac1e1aed2c21153ff55666771cc766c7c06bb3086cafb169108bee27b0889604ed88e805144cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "f46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3a",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xf46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127ac",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127ac",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "7ad0c45d4c7425fd1e4b76e65eb2fe172e9b7700a7e9ed25ea226c96cf064b3b",
+        "lastblockhash" : "0x983e75e8fec53cd5fd74f030ecb78c7a1bc4b3a100043ef0ae740fdc496e3aac",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcallcodecallcode_011_OOGMAfter_2_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "7058fea4daad538b563bd675d4a0cd6c096139b3b8b8b318d178f43c8a07a805",
-                    "mixHash" : "177ab26c63c54b4878f74ebf7e8c7e442f4476d6a4f8a8c8c305f4ba7af04d7e",
-                    "nonce" : "4d09b87e3f3ec04f",
+                    "hash" : "0x12a85563d08914700a05b594f736e49e68aa74ec160bab6c20d66bf07bdeaed8",
+                    "mixHash" : "0x19949c3525cfb0465e320b13a94c77198beb71d33da0d8e236aa2e08f3fb210d",
+                    "nonce" : "0x45ae5e4d92a61a9a",
                     "number" : "0x01",
-                    "parentHash" : "f46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3a",
-                    "receiptTrie" : "782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5",
-                    "stateRoot" : "306c6dacbf5b92095477a3ea1801ed1bf9d5e1c6740c1311331b4b88dca18b28",
+                    "parentHash" : "0xf46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3a",
+                    "receiptTrie" : "0x782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5",
+                    "stateRoot" : "0x306c6dacbf5b92095477a3ea1801ed1bf9d5e1c6740c1311331b4b88dca18b28",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0f46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0306c6dacbf5b92095477a3ea1801ed1bf9d5e1c6740c1311331b4b88dca18b28a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0177ab26c63c54b4878f74ebf7e8c7e442f4476d6a4f8a8c8c305f4ba7af04d7e884d09b87e3f3ec04ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0f46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0306c6dacbf5b92095477a3ea1801ed1bf9d5e1c6740c1311331b4b88dca18b28a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a019949c3525cfb0465e320b13a94c77198beb71d33da0d8e236aa2e08f3fb210d8845ae5e4d92a61a9af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "f46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3a",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xf46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127ac",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127ac",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "7058fea4daad538b563bd675d4a0cd6c096139b3b8b8b318d178f43c8a07a805",
+        "lastblockhash" : "0x12a85563d08914700a05b594f736e49e68aa74ec160bab6c20d66bf07bdeaed8",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcallcodecallcode_011_OOGMAfter_2_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "65824d19b847442ef2389b90d3b09fc851e02f1f45ca1ac6575b16dc05383b2e",
-                    "mixHash" : "6058bbb75f14c6ac5b96e0e6a4f7eef48477463fb7bf9aa24a9bac7a3265f547",
-                    "nonce" : "60bbe0e89fe5209a",
+                    "hash" : "0xff96bd510fe5f45506813cf9ba3bb1bea755a388ecd1dba615b83c0066dccf2e",
+                    "mixHash" : "0x6e5894ac049dbf74400e690f5f2f2f00217cccc6d7d2a91ee69a8f26f2658870",
+                    "nonce" : "0x9596933acf731858",
                     "number" : "0x01",
-                    "parentHash" : "f46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3a",
-                    "receiptTrie" : "62c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379",
-                    "stateRoot" : "ef04802692097dc89b1f30e4c0d7b4f0c822d852976785f4986d8273eb1a967d",
+                    "parentHash" : "0xf46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3a",
+                    "receiptTrie" : "0x62c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379",
+                    "stateRoot" : "0xef04802692097dc89b1f30e4c0d7b4f0c822d852976785f4986d8273eb1a967d",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0f46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef04802692097dc89b1f30e4c0d7b4f0c822d852976785f4986d8273eb1a967da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea062c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a06058bbb75f14c6ac5b96e0e6a4f7eef48477463fb7bf9aa24a9bac7a3265f5478860bbe0e89fe5209af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0f46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef04802692097dc89b1f30e4c0d7b4f0c822d852976785f4986d8273eb1a967da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea062c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a06e5894ac049dbf74400e690f5f2f2f00217cccc6d7d2a91ee69a8f26f2658870889596933acf731858f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,102 +340,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "f46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3a",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xf46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127ac",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127ac",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "65824d19b847442ef2389b90d3b09fc851e02f1f45ca1ac6575b16dc05383b2e",
+        "lastblockhash" : "0xff96bd510fe5f45506813cf9ba3bb1bea755a388ecd1dba615b83c0066dccf2e",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -428,36 +443,41 @@
         }
     },
     "callcallcodecallcode_011_OOGMAfter_2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "735a571e5d11a0eaa239d32a6009d3cca44f87ef6fdbfcb34e8d24eb07c51281",
-                    "mixHash" : "0721fb46af249b0fbab18e1e7b572ea2de4fae85bd83dbe9364b22dc172f1094",
-                    "nonce" : "007c51f82035ae56",
+                    "hash" : "0x66729ae4e13ab06f6eecda6025fa96db5cf5a8566e105ab9c487ed920f99f989",
+                    "mixHash" : "0x4e335db113d713a84ee603f7cfd55b623bcf806f3ddf90e47183e0309d7ab3cc",
+                    "nonce" : "0xf98fe87d0211fc29",
                     "number" : "0x01",
-                    "parentHash" : "f46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3a",
-                    "receiptTrie" : "62c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379",
-                    "stateRoot" : "ef04802692097dc89b1f30e4c0d7b4f0c822d852976785f4986d8273eb1a967d",
+                    "parentHash" : "0xf46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3a",
+                    "receiptTrie" : "0x62c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379",
+                    "stateRoot" : "0xef04802692097dc89b1f30e4c0d7b4f0c822d852976785f4986d8273eb1a967d",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0f46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef04802692097dc89b1f30e4c0d7b4f0c822d852976785f4986d8273eb1a967da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea062c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a00721fb46af249b0fbab18e1e7b572ea2de4fae85bd83dbe9364b22dc172f109488007c51f82035ae56f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0f46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef04802692097dc89b1f30e4c0d7b4f0c822d852976785f4986d8273eb1a967da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea062c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a04e335db113d713a84ee603f7cfd55b623bcf806f3ddf90e47183e0309d7ab3cc88f98fe87d0211fc29f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -467,102 +487,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "f46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3a",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xf46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127ac",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127ac",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "735a571e5d11a0eaa239d32a6009d3cca44f87ef6fdbfcb34e8d24eb07c51281",
+        "lastblockhash" : "0x66729ae4e13ab06f6eecda6025fa96db5cf5a8566e105ab9c487ed920f99f989",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcallcodecallcode_011_OOGMAfter_2_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0155fd",
+                    "hash" : "0x4da81f3b2422b7f7da2f3685a05e8050c6cadffadadd9c0c0954f63fb1b895e9",
+                    "mixHash" : "0xdc0eaa08092d9d53a2a661019a213c9116530756ce132dbc2607915e440bcc72",
+                    "nonce" : "0xfddbc517d31b89a4",
+                    "number" : "0x01",
+                    "parentHash" : "0xf46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3a",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0x5366edb70bb6c9935d9507479d0c547d45a4bcc6ecaa200ba16884cf3cc20f00",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0f46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05366edb70bb6c9935d9507479d0c547d45a4bcc6ecaa200ba16884cf3cc20f00a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0dc0eaa08092d9d53a2a661019a213c9116530756ce132dbc2607915e440bcc7288fddbc517d31b89a4f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xf46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3a",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127ac",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x4da81f3b2422b7f7da2f3685a05e8050c6cadffadadd9c0c0954f63fb1b895e9",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555fd",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa03",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f1600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1_d0g0v0.json
index dcad628fe..dcf64cfb2 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcall_100_OOGMAfter_1_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcall_100_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155ff",
-                    "hash" : "5014baebf4d2568b5a93a1eb6147331ac4653670b1c9014cb1dd6ee92495237f",
-                    "mixHash" : "db6f1b0a88e3dedcb1674ecf0adea58874e005db5fdde32d0af805e6766ecf32",
-                    "nonce" : "26a57f0837a17388",
+                    "hash" : "0x22b446704767526c3435f82e81068317fecdeb7e38b608aa1a0cc5e08685182b",
+                    "mixHash" : "0x6dbebd2b27471dbb51b2a79e130ccf480824d75c17c2fe9f23be13a71ee37a28",
+                    "nonce" : "0xc74ec30864851128",
                     "number" : "0x01",
-                    "parentHash" : "c6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889e",
-                    "receiptTrie" : "af03afeaa2c9d90f1ab72fbf556b355b4fb802f3c847ff3009f8ca25fc19c674",
-                    "stateRoot" : "b9c293f18a902d508ce77fbf62190970cdd4363aca72cf692bfad55895ba8758",
+                    "parentHash" : "0xc6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889e",
+                    "receiptTrie" : "0xaf03afeaa2c9d90f1ab72fbf556b355b4fb802f3c847ff3009f8ca25fc19c674",
+                    "stateRoot" : "0xb9c293f18a902d508ce77fbf62190970cdd4363aca72cf692bfad55895ba8758",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b9c293f18a902d508ce77fbf62190970cdd4363aca72cf692bfad55895ba8758a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0af03afeaa2c9d90f1ab72fbf556b355b4fb802f3c847ff3009f8ca25fc19c674b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155ff8203e880a0db6f1b0a88e3dedcb1674ecf0adea58874e005db5fdde32d0af805e6766ecf328826a57f0837a17388f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0c6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b9c293f18a902d508ce77fbf62190970cdd4363aca72cf692bfad55895ba8758a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0af03afeaa2c9d90f1ab72fbf556b355b4fb802f3c847ff3009f8ca25fc19c674b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155ff8203e880a06dbebd2b27471dbb51b2a79e130ccf480824d75c17c2fe9f23be13a71ee37a2888c74ec30864851128f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "c6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "d5555f63b1e84328b4c33bcf3684b9c00f89427419b291c48f154d08f977cbcf",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd5555f63b1e84328b4c33bcf3684b9c00f89427419b291c48f154d08f977cbcf",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5555f63b1e84328b4c33bcf3684b9c00f89427419b291c48f154d08f977cbcfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "5014baebf4d2568b5a93a1eb6147331ac4653670b1c9014cb1dd6ee92495237f",
+        "lastblockhash" : "0x22b446704767526c3435f82e81068317fecdeb7e38b608aa1a0cc5e08685182b",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555ff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcodecallcall_100_OOGMAfter_1_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcall_100_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155ff",
-                    "hash" : "99952ad5baad2e045e61d8b8c5b94e1e9f6e4b0af3f9b17c97d47ce084012823",
-                    "mixHash" : "795636d41c055c5d6e81f674587e555511dcf4bb32854a34cfeb8d08085722f6",
-                    "nonce" : "f783b438da0c2bb9",
+                    "hash" : "0x948b843e37933caae76f0617a1e1ecd54ad03532c462b0f4ef870d6baee80e9c",
+                    "mixHash" : "0x9c2a077734119522489e1186b4205dbd74a4b861476c51d4c68099631445b864",
+                    "nonce" : "0x7e6c8ae554198a60",
                     "number" : "0x01",
-                    "parentHash" : "c6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889e",
-                    "receiptTrie" : "af03afeaa2c9d90f1ab72fbf556b355b4fb802f3c847ff3009f8ca25fc19c674",
-                    "stateRoot" : "b9c293f18a902d508ce77fbf62190970cdd4363aca72cf692bfad55895ba8758",
+                    "parentHash" : "0xc6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889e",
+                    "receiptTrie" : "0xaf03afeaa2c9d90f1ab72fbf556b355b4fb802f3c847ff3009f8ca25fc19c674",
+                    "stateRoot" : "0xb9c293f18a902d508ce77fbf62190970cdd4363aca72cf692bfad55895ba8758",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b9c293f18a902d508ce77fbf62190970cdd4363aca72cf692bfad55895ba8758a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0af03afeaa2c9d90f1ab72fbf556b355b4fb802f3c847ff3009f8ca25fc19c674b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155ff8203e880a0795636d41c055c5d6e81f674587e555511dcf4bb32854a34cfeb8d08085722f688f783b438da0c2bb9f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0c6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b9c293f18a902d508ce77fbf62190970cdd4363aca72cf692bfad55895ba8758a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0af03afeaa2c9d90f1ab72fbf556b355b4fb802f3c847ff3009f8ca25fc19c674b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155ff8203e880a09c2a077734119522489e1186b4205dbd74a4b861476c51d4c68099631445b864887e6c8ae554198a60f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "c6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "d5555f63b1e84328b4c33bcf3684b9c00f89427419b291c48f154d08f977cbcf",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd5555f63b1e84328b4c33bcf3684b9c00f89427419b291c48f154d08f977cbcf",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5555f63b1e84328b4c33bcf3684b9c00f89427419b291c48f154d08f977cbcfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "99952ad5baad2e045e61d8b8c5b94e1e9f6e4b0af3f9b17c97d47ce084012823",
+        "lastblockhash" : "0x948b843e37933caae76f0617a1e1ecd54ad03532c462b0f4ef870d6baee80e9c",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555ff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcodecallcall_100_OOGMAfter_1_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcall_100_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "c91327adedc33a6f614c8d50005d8bd95a32800a6c7f9809373be62e0d6bbc4d",
-                    "mixHash" : "714212f7ea1ca168aae1b9622abd8be1be97f72a08b7d5815331d332ec068a83",
-                    "nonce" : "cd0250dded6635dd",
+                    "hash" : "0x553ae0a167e2ad674b3d466a7204b411c0e9a549addf9a97e8bf675b88e4a9ef",
+                    "mixHash" : "0x5b8bcd401da91106dd3c109ee435a8a4f95470a810d1e81e7113e70bfd8b5017",
+                    "nonce" : "0x7ea98a7fd16ac45b",
                     "number" : "0x01",
-                    "parentHash" : "c6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889e",
-                    "receiptTrie" : "dbcab094dcfdbed9ac81c2f9f65603858e995c1152dca8c3d66f8cd197d2ab26",
-                    "stateRoot" : "0d42005414f47787ed000e2a5d03e16f2b98b1aaa7464edada25424ca88c9f67",
+                    "parentHash" : "0xc6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889e",
+                    "receiptTrie" : "0xdbcab094dcfdbed9ac81c2f9f65603858e995c1152dca8c3d66f8cd197d2ab26",
+                    "stateRoot" : "0x0d42005414f47787ed000e2a5d03e16f2b98b1aaa7464edada25424ca88c9f67",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00d42005414f47787ed000e2a5d03e16f2b98b1aaa7464edada25424ca88c9f67a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0dbcab094dcfdbed9ac81c2f9f65603858e995c1152dca8c3d66f8cd197d2ab26b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a0714212f7ea1ca168aae1b9622abd8be1be97f72a08b7d5815331d332ec068a8388cd0250dded6635ddf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0c6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00d42005414f47787ed000e2a5d03e16f2b98b1aaa7464edada25424ca88c9f67a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0dbcab094dcfdbed9ac81c2f9f65603858e995c1152dca8c3d66f8cd197d2ab26b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a05b8bcd401da91106dd3c109ee435a8a4f95470a810d1e81e7113e70bfd8b5017887ea98a7fd16ac45bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,102 +340,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "c6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "d5555f63b1e84328b4c33bcf3684b9c00f89427419b291c48f154d08f977cbcf",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd5555f63b1e84328b4c33bcf3684b9c00f89427419b291c48f154d08f977cbcf",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5555f63b1e84328b4c33bcf3684b9c00f89427419b291c48f154d08f977cbcfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c91327adedc33a6f614c8d50005d8bd95a32800a6c7f9809373be62e0d6bbc4d",
+        "lastblockhash" : "0x553ae0a167e2ad674b3d466a7204b411c0e9a549addf9a97e8bf675b88e4a9ef",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f69fe0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7616020",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -428,36 +443,41 @@
         }
     },
     "callcodecallcall_100_OOGMAfter_1_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcall_100_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150c9",
-                    "hash" : "0872cc2e796834505a68afc6719392571e89484b653f44384317a94e8c609576",
-                    "mixHash" : "7da7575de8ec7420e8b870f31db0b4877abb96e106a2a4ab7134b4e1fb0b16c2",
-                    "nonce" : "c7d556f7ded598f7",
+                    "hash" : "0x1d113f1c2d15d778ffc0aeb395f8c64990c7c0f21ee10e4b66c1112466f8e0e5",
+                    "mixHash" : "0x584c4a39df81d741ca36f57fd48b9292cb18c2f2c3813e21ec51b53381eeb68f",
+                    "nonce" : "0xa94dbbbfdf9a9b45",
                     "number" : "0x01",
-                    "parentHash" : "c6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889e",
-                    "receiptTrie" : "4727314bbdb90938e0f1d9dccd4016b988d4db06d4bc9404034c4451333c6dfb",
-                    "stateRoot" : "73f9083b6f959aa115b0ca25a51d1fa15a41d45a97a890a70f36e42bc736c984",
+                    "parentHash" : "0xc6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889e",
+                    "receiptTrie" : "0x4727314bbdb90938e0f1d9dccd4016b988d4db06d4bc9404034c4451333c6dfb",
+                    "stateRoot" : "0x73f9083b6f959aa115b0ca25a51d1fa15a41d45a97a890a70f36e42bc736c984",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f9083b6f959aa115b0ca25a51d1fa15a41d45a97a890a70f36e42bc736c984a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04727314bbdb90938e0f1d9dccd4016b988d4db06d4bc9404034c4451333c6dfbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c98203e880a07da7575de8ec7420e8b870f31db0b4877abb96e106a2a4ab7134b4e1fb0b16c288c7d556f7ded598f7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0c6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f9083b6f959aa115b0ca25a51d1fa15a41d45a97a890a70f36e42bc736c984a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04727314bbdb90938e0f1d9dccd4016b988d4db06d4bc9404034c4451333c6dfbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c98203e880a0584c4a39df81d741ca36f57fd48b9292cb18c2f2c3813e21ec51b53381eeb68f88a94dbbbfdf9a9b45f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -467,102 +487,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "c6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "d5555f63b1e84328b4c33bcf3684b9c00f89427419b291c48f154d08f977cbcf",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd5555f63b1e84328b4c33bcf3684b9c00f89427419b291c48f154d08f977cbcf",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5555f63b1e84328b4c33bcf3684b9c00f89427419b291c48f154d08f977cbcfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0872cc2e796834505a68afc6719392571e89484b653f44384317a94e8c609576",
+        "lastblockhash" : "0x1d113f1c2d15d778ffc0aeb395f8c64990c7c0f21ee10e4b66c1112466f8e0e5",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550c9",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af37",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f26001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcall_100_OOGMAfter_1_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcall_100_OOGMAfter_1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0155ff",
+                    "hash" : "0x56ab231f929b9617113055606d6d451d7e9c1da0569e8550b0a59aad118a096e",
+                    "mixHash" : "0x5de8e6697e6b7b2bba95fec857a138fa6c714348dea198016e0b4f32b562b915",
+                    "nonce" : "0x68922402c67b822d",
+                    "number" : "0x01",
+                    "parentHash" : "0xc6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889e",
+                    "receiptTrie" : "0x904ef34262912ab9ed82ebe8efcc7e7d10f885cb2a54713e6772e69cbee8b33c",
+                    "stateRoot" : "0xafe83522f01f8f96576ab6a973635b1156f16c2c7b4768d6a1e9b99c570b4b2a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0c6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0afe83522f01f8f96576ab6a973635b1156f16c2c7b4768d6a1e9b99c570b4b2aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0904ef34262912ab9ed82ebe8efcc7e7d10f885cb2a54713e6772e69cbee8b33cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155ff8203e880a05de8e6697e6b7b2bba95fec857a138fa6c714348dea198016e0b4f32b562b9158868922402c67b822df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xc6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xd5555f63b1e84328b4c33bcf3684b9c00f89427419b291c48f154d08f977cbcf",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5555f63b1e84328b4c33bcf3684b9c00f89427419b291c48f154d08f977cbcfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x56ab231f929b9617113055606d6d451d7e9c1da0569e8550b0a59aad118a096e",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f26001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555ff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa01",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2_d0g0v0.json
index 750bdb2f6..85ca8e3db 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcall_100_OOGMAfter_2_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcall_100_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fa",
-                    "hash" : "7cb0c6999cc6588755f9b6024d9089a24a8c7a3e418f67b83148501f60d49a94",
-                    "mixHash" : "fcd2e91a9fad102617b13bfd85d830641b0d746994d36c0dc134951c77943cbc",
-                    "nonce" : "d735ac3be6fb743f",
+                    "hash" : "0xb392d2bce72f843b91dda9e4a842e7423e2a1454fb86758252233c29945b38d6",
+                    "mixHash" : "0x85afe6c848a494b0424154ce467f30894fa66423c73890c21856ff7e18d10ae9",
+                    "nonce" : "0x19e02529a00f51bc",
                     "number" : "0x01",
-                    "parentHash" : "d7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eb",
-                    "receiptTrie" : "a5a1242dce5bd8894b5a20d45052f8caaf994cfab4415164991ca6510c0a298c",
-                    "stateRoot" : "10b3a117b61f19057196f91110a47127f8d48b68774ceb1003fecda60d49ddb8",
+                    "parentHash" : "0xd7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eb",
+                    "receiptTrie" : "0xa5a1242dce5bd8894b5a20d45052f8caaf994cfab4415164991ca6510c0a298c",
+                    "stateRoot" : "0x10b3a117b61f19057196f91110a47127f8d48b68774ceb1003fecda60d49ddb8",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0d7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010b3a117b61f19057196f91110a47127f8d48b68774ceb1003fecda60d49ddb8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a5a1242dce5bd8894b5a20d45052f8caaf994cfab4415164991ca6510c0a298cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a0fcd2e91a9fad102617b13bfd85d830641b0d746994d36c0dc134951c77943cbc88d735ac3be6fb743ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0d7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010b3a117b61f19057196f91110a47127f8d48b68774ceb1003fecda60d49ddb8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a5a1242dce5bd8894b5a20d45052f8caaf994cfab4415164991ca6510c0a298cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a085afe6c848a494b0424154ce467f30894fa66423c73890c21856ff7e18d10ae98819e02529a00f51bcf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "d7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eb",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xd7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "285b205f333a9513ddcc1de89329a697231fe412772758ee37dca80e6b773f5a",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x285b205f333a9513ddcc1de89329a697231fe412772758ee37dca80e6b773f5a",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0285b205f333a9513ddcc1de89329a697231fe412772758ee37dca80e6b773f5aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "7cb0c6999cc6588755f9b6024d9089a24a8c7a3e418f67b83148501f60d49a94",
+        "lastblockhash" : "0xb392d2bce72f843b91dda9e4a842e7423e2a1454fb86758252233c29945b38d6",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fa",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa06",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcodecallcall_100_OOGMAfter_2_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcall_100_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fa",
-                    "hash" : "82dd0425e5317bdef01beafb513dc292b59a0f7357ae24f5f4401d9686b418d5",
-                    "mixHash" : "3261b38b85c8eb99e4b9d39cd23e8eee7d8e3a39db7bf9ec31b7564a42e2c7eb",
-                    "nonce" : "b534209787d06386",
+                    "hash" : "0xa5862a0f6b7079b0e12aa1bb5c440ee63c7bc50dc1becb6eef8b47ddd6e84536",
+                    "mixHash" : "0x1684eaf96068ac4f8f863e4015d8174146550f20f5bf4ed5a40362412635db59",
+                    "nonce" : "0x1fabb22d3219b88a",
                     "number" : "0x01",
-                    "parentHash" : "d7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eb",
-                    "receiptTrie" : "a5a1242dce5bd8894b5a20d45052f8caaf994cfab4415164991ca6510c0a298c",
-                    "stateRoot" : "10b3a117b61f19057196f91110a47127f8d48b68774ceb1003fecda60d49ddb8",
+                    "parentHash" : "0xd7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eb",
+                    "receiptTrie" : "0xa5a1242dce5bd8894b5a20d45052f8caaf994cfab4415164991ca6510c0a298c",
+                    "stateRoot" : "0x10b3a117b61f19057196f91110a47127f8d48b68774ceb1003fecda60d49ddb8",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0d7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010b3a117b61f19057196f91110a47127f8d48b68774ceb1003fecda60d49ddb8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a5a1242dce5bd8894b5a20d45052f8caaf994cfab4415164991ca6510c0a298cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a03261b38b85c8eb99e4b9d39cd23e8eee7d8e3a39db7bf9ec31b7564a42e2c7eb88b534209787d06386f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0d7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010b3a117b61f19057196f91110a47127f8d48b68774ceb1003fecda60d49ddb8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a5a1242dce5bd8894b5a20d45052f8caaf994cfab4415164991ca6510c0a298cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a01684eaf96068ac4f8f863e4015d8174146550f20f5bf4ed5a40362412635db59881fabb22d3219b88af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "d7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eb",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xd7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "285b205f333a9513ddcc1de89329a697231fe412772758ee37dca80e6b773f5a",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x285b205f333a9513ddcc1de89329a697231fe412772758ee37dca80e6b773f5a",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0285b205f333a9513ddcc1de89329a697231fe412772758ee37dca80e6b773f5aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "82dd0425e5317bdef01beafb513dc292b59a0f7357ae24f5f4401d9686b418d5",
+        "lastblockhash" : "0xa5862a0f6b7079b0e12aa1bb5c440ee63c7bc50dc1becb6eef8b47ddd6e84536",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fa",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa06",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcodecallcall_100_OOGMAfter_2_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcall_100_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "32afbea5e0fd8be77ea11594796cafa15a39d69130570873b98cd6a527909943",
-                    "mixHash" : "de51a0b7ac62761e6b8cafa245f5ff487814ce64343b39771ac37e2463cf3e64",
-                    "nonce" : "34785c0da507216f",
+                    "hash" : "0xbf4fa99abb309fbbb0dbc8be80403429925687aab73314ed15d6ab3d8f0cde3c",
+                    "mixHash" : "0x62277327bd4d0909225445e765eec86259b978227113c42b19e41f610eada7bf",
+                    "nonce" : "0x5e7639939692e5b0",
                     "number" : "0x01",
-                    "parentHash" : "d7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eb",
-                    "receiptTrie" : "fa85ee1da544d20ac13450d12d3fa5f1c46f40db9bc95cc1bc5bb13a7afa18d6",
-                    "stateRoot" : "2128977407c28b9ae0c8d710dd5103211f4d9aa0ed57b23642e221c0ec9e7597",
+                    "parentHash" : "0xd7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eb",
+                    "receiptTrie" : "0xfa85ee1da544d20ac13450d12d3fa5f1c46f40db9bc95cc1bc5bb13a7afa18d6",
+                    "stateRoot" : "0x2128977407c28b9ae0c8d710dd5103211f4d9aa0ed57b23642e221c0ec9e7597",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0d7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02128977407c28b9ae0c8d710dd5103211f4d9aa0ed57b23642e221c0ec9e7597a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fa85ee1da544d20ac13450d12d3fa5f1c46f40db9bc95cc1bc5bb13a7afa18d6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a0de51a0b7ac62761e6b8cafa245f5ff487814ce64343b39771ac37e2463cf3e648834785c0da507216ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0d7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02128977407c28b9ae0c8d710dd5103211f4d9aa0ed57b23642e221c0ec9e7597a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fa85ee1da544d20ac13450d12d3fa5f1c46f40db9bc95cc1bc5bb13a7afa18d6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a062277327bd4d0909225445e765eec86259b978227113c42b19e41f610eada7bf885e7639939692e5b0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,102 +340,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "d7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eb",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xd7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "285b205f333a9513ddcc1de89329a697231fe412772758ee37dca80e6b773f5a",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x285b205f333a9513ddcc1de89329a697231fe412772758ee37dca80e6b773f5a",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0285b205f333a9513ddcc1de89329a697231fe412772758ee37dca80e6b773f5aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "32afbea5e0fd8be77ea11594796cafa15a39d69130570873b98cd6a527909943",
+        "lastblockhash" : "0xbf4fa99abb309fbbb0dbc8be80403429925687aab73314ed15d6ab3d8f0cde3c",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f69fe0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7616020",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -428,36 +443,41 @@
         }
     },
     "callcodecallcall_100_OOGMAfter_2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcall_100_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150c9",
-                    "hash" : "ebb0e78f152ff5092d414af0b24ed1e78153a7e38869f2211a6ddcc1300c83db",
-                    "mixHash" : "58e03bb914450ff6e8f1824ad472cac2dc82a1d02569bc6a9cdf759b68377939",
-                    "nonce" : "129c7ccb19bc5f3e",
+                    "hash" : "0xf7dd1b684f0a4e3a62e01dab66fc782f332585895a48da1183ad557c1bc5cc74",
+                    "mixHash" : "0x2b74faca4a25c922735298a1d89086510657275ed5e2fc08678164362729e67e",
+                    "nonce" : "0x2ba0b45383cb5a60",
                     "number" : "0x01",
-                    "parentHash" : "d7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eb",
-                    "receiptTrie" : "01d39682eae93e490c236646bba33ab94ec805829ddeadda107612cd49bcf2de",
-                    "stateRoot" : "e210ded9d183c7a0118ea534649569a2fa59346fda49459511a04f324e1cb320",
+                    "parentHash" : "0xd7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eb",
+                    "receiptTrie" : "0x01d39682eae93e490c236646bba33ab94ec805829ddeadda107612cd49bcf2de",
+                    "stateRoot" : "0xe210ded9d183c7a0118ea534649569a2fa59346fda49459511a04f324e1cb320",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0d7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e210ded9d183c7a0118ea534649569a2fa59346fda49459511a04f324e1cb320a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea001d39682eae93e490c236646bba33ab94ec805829ddeadda107612cd49bcf2deb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c98203e880a058e03bb914450ff6e8f1824ad472cac2dc82a1d02569bc6a9cdf759b6837793988129c7ccb19bc5f3ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0d7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e210ded9d183c7a0118ea534649569a2fa59346fda49459511a04f324e1cb320a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea001d39682eae93e490c236646bba33ab94ec805829ddeadda107612cd49bcf2deb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c98203e880a02b74faca4a25c922735298a1d89086510657275ed5e2fc08678164362729e67e882ba0b45383cb5a60f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -467,102 +487,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "d7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eb",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xd7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "285b205f333a9513ddcc1de89329a697231fe412772758ee37dca80e6b773f5a",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x285b205f333a9513ddcc1de89329a697231fe412772758ee37dca80e6b773f5a",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0285b205f333a9513ddcc1de89329a697231fe412772758ee37dca80e6b773f5aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "ebb0e78f152ff5092d414af0b24ed1e78153a7e38869f2211a6ddcc1300c83db",
+        "lastblockhash" : "0xf7dd1b684f0a4e3a62e01dab66fc782f332585895a48da1183ad557c1bc5cc74",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550c9",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af37",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcall_100_OOGMAfter_2_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcall_100_OOGMAfter_2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0155fa",
+                    "hash" : "0x70a4fb0f7bd5ac71a6f1ccb5cac5271619d46cbeb413a07818dbe0b009c28551",
+                    "mixHash" : "0x33de2401a6ec9ea4dffb4acd4492c243713151475a10bef615fbbfdc71838f73",
+                    "nonce" : "0x8ec7d352c60a2ec3",
+                    "number" : "0x01",
+                    "parentHash" : "0xd7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eb",
+                    "receiptTrie" : "0x9c15c271a51ae8f1007b852a5c63f8adccff1dafb06f5a58921c871c65abaff9",
+                    "stateRoot" : "0x81919cc1b08d7b1a01c889cbc3d514dc174bc475397a2f311c23d3a9be47f017",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0d7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa081919cc1b08d7b1a01c889cbc3d514dc174bc475397a2f311c23d3a9be47f017a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09c15c271a51ae8f1007b852a5c63f8adccff1dafb06f5a58921c871c65abaff9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a033de2401a6ec9ea4dffb4acd4492c243713151475a10bef615fbbfdc71838f73888ec7d352c60a2ec3f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xd7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eb",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x285b205f333a9513ddcc1de89329a697231fe412772758ee37dca80e6b773f5a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0285b205f333a9513ddcc1de89329a697231fe412772758ee37dca80e6b773f5aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x70a4fb0f7bd5ac71a6f1ccb5cac5271619d46cbeb413a07818dbe0b009c28551",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa06",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3_d0g0v0.json
index 456182de1..fb603dd1d 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcall_100_OOGMAfter_3_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcall_100_OOGMAfter_3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "2e10af777e67501a0afb6cd619ac6466ec4ab61158946e01ce4d2836caa715d0",
-                    "mixHash" : "5dccb4eacc70c6d3bc0c1129f1dfb6d064f85fc94e9870288656528cf6553f27",
-                    "nonce" : "bb4db37d7d2836d4",
+                    "hash" : "0x73e5a46239926da18a2023897f7aafc248c36c48822d2dcbcd79b27211584d41",
+                    "mixHash" : "0xa62fcf556cec3808926ee39c797ad633b137351195d0a655b6331754ce1623fc",
+                    "nonce" : "0xd416a53d55982127",
                     "number" : "0x01",
-                    "parentHash" : "48077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776",
-                    "receiptTrie" : "43c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05",
-                    "stateRoot" : "40d6012251ddd9a6759498d4ea32ad8f5a5b6f541bc17e5673fc063596ceef18",
+                    "parentHash" : "0x48077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776",
+                    "receiptTrie" : "0x43c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05",
+                    "stateRoot" : "0x40d6012251ddd9a6759498d4ea32ad8f5a5b6f541bc17e5673fc063596ceef18",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a048077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040d6012251ddd9a6759498d4ea32ad8f5a5b6f541bc17e5673fc063596ceef18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea043c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a05dccb4eacc70c6d3bc0c1129f1dfb6d064f85fc94e9870288656528cf6553f2788bb4db37d7d2836d4f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a048077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040d6012251ddd9a6759498d4ea32ad8f5a5b6f541bc17e5673fc063596ceef18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea043c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0a62fcf556cec3808926ee39c797ad633b137351195d0a655b6331754ce1623fc88d416a53d55982127f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "48077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x48077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "2e10af777e67501a0afb6cd619ac6466ec4ab61158946e01ce4d2836caa715d0",
+        "lastblockhash" : "0x73e5a46239926da18a2023897f7aafc248c36c48822d2dcbcd79b27211584d41",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcodecallcall_100_OOGMAfter_3_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcall_100_OOGMAfter_3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "18adae46106f784cb6f2f86d111f1c10ef692d3f966b70b007b667d3e97cb4f1",
-                    "mixHash" : "eb636cc2da787d331449ae5e3c965dc21087d591538aa42e9665196aae28607b",
-                    "nonce" : "3b17bf48e8edea8d",
+                    "hash" : "0x8cf5f6ad286e4a5fbd44163e0ac8aeac6023ebfd4a0ccec5107e4cef2dc1fa18",
+                    "mixHash" : "0x85869a565ca6de96362e949b952300ccd650d52b66d336eb87aad11f2383fdbe",
+                    "nonce" : "0x185274ff9366afc8",
                     "number" : "0x01",
-                    "parentHash" : "48077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776",
-                    "receiptTrie" : "43c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05",
-                    "stateRoot" : "40d6012251ddd9a6759498d4ea32ad8f5a5b6f541bc17e5673fc063596ceef18",
+                    "parentHash" : "0x48077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776",
+                    "receiptTrie" : "0x43c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05",
+                    "stateRoot" : "0x40d6012251ddd9a6759498d4ea32ad8f5a5b6f541bc17e5673fc063596ceef18",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a048077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040d6012251ddd9a6759498d4ea32ad8f5a5b6f541bc17e5673fc063596ceef18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea043c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0eb636cc2da787d331449ae5e3c965dc21087d591538aa42e9665196aae28607b883b17bf48e8edea8df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a048077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040d6012251ddd9a6759498d4ea32ad8f5a5b6f541bc17e5673fc063596ceef18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea043c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a085869a565ca6de96362e949b952300ccd650d52b66d336eb87aad11f2383fdbe88185274ff9366afc8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "48077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x48077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "18adae46106f784cb6f2f86d111f1c10ef692d3f966b70b007b667d3e97cb4f1",
+        "lastblockhash" : "0x8cf5f6ad286e4a5fbd44163e0ac8aeac6023ebfd4a0ccec5107e4cef2dc1fa18",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcodecallcall_100_OOGMAfter_3_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcall_100_OOGMAfter_3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "aa338308a04cd69fd2c53bedac4569ce9198a6ea19b7623a1da7779e42522afd",
-                    "mixHash" : "253d1bc09e59ad05428c9b2a71ac152fd551fdb924049aed60ef71a369cd5161",
-                    "nonce" : "62ad1f56cd076f56",
+                    "hash" : "0x446135ebf7d76bae96a3fd6a6cf1dc105a6c8d500baac578403eca734398f9e1",
+                    "mixHash" : "0x17c4b7e5404c28a4aea240ddeb614107db2302f0cd76371eb515f73a4d62e27d",
+                    "nonce" : "0xd608dfc3fe58e2cf",
                     "number" : "0x01",
-                    "parentHash" : "48077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776",
-                    "receiptTrie" : "31a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6",
-                    "stateRoot" : "e9311a44963df12e57ebaa6ff0fd625b2effc80eb98fc8c73fbe18cf975d020e",
+                    "parentHash" : "0x48077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776",
+                    "receiptTrie" : "0x31a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6",
+                    "stateRoot" : "0xe9311a44963df12e57ebaa6ff0fd625b2effc80eb98fc8c73fbe18cf975d020e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a048077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9311a44963df12e57ebaa6ff0fd625b2effc80eb98fc8c73fbe18cf975d020ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea031a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0253d1bc09e59ad05428c9b2a71ac152fd551fdb924049aed60ef71a369cd51618862ad1f56cd076f56f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a048077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9311a44963df12e57ebaa6ff0fd625b2effc80eb98fc8c73fbe18cf975d020ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea031a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a017c4b7e5404c28a4aea240ddeb614107db2302f0cd76371eb515f73a4d62e27d88d608dfc3fe58e2cff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,102 +340,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "48077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x48077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "aa338308a04cd69fd2c53bedac4569ce9198a6ea19b7623a1da7779e42522afd",
+        "lastblockhash" : "0x446135ebf7d76bae96a3fd6a6cf1dc105a6c8d500baac578403eca734398f9e1",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -428,36 +443,41 @@
         }
     },
     "callcodecallcall_100_OOGMAfter_3_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcall_100_OOGMAfter_3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "69c96b327c76fb2dcb54c7704bbedab6478198f0fe9d6fc9aeca8e5cc5dead8b",
-                    "mixHash" : "fc46514ac3884ff166742615a7e2a404c581e401f8d64cd60c69a8b877e8f7a2",
-                    "nonce" : "1012508abcb971a0",
+                    "hash" : "0x0a5b7322f331fee32f65670de3432b461c0989a61a00746d057ac8307618e42b",
+                    "mixHash" : "0x8c84f9147e6c5499a388367670b92d032673a2800eba671682adfe9ebbcae5bc",
+                    "nonce" : "0x6a529e6bb2c857c7",
                     "number" : "0x01",
-                    "parentHash" : "48077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776",
-                    "receiptTrie" : "31a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6",
-                    "stateRoot" : "e9311a44963df12e57ebaa6ff0fd625b2effc80eb98fc8c73fbe18cf975d020e",
+                    "parentHash" : "0x48077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776",
+                    "receiptTrie" : "0x31a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6",
+                    "stateRoot" : "0xe9311a44963df12e57ebaa6ff0fd625b2effc80eb98fc8c73fbe18cf975d020e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a048077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9311a44963df12e57ebaa6ff0fd625b2effc80eb98fc8c73fbe18cf975d020ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea031a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0fc46514ac3884ff166742615a7e2a404c581e401f8d64cd60c69a8b877e8f7a2881012508abcb971a0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a048077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9311a44963df12e57ebaa6ff0fd625b2effc80eb98fc8c73fbe18cf975d020ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea031a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a08c84f9147e6c5499a388367670b92d032673a2800eba671682adfe9ebbcae5bc886a529e6bb2c857c7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -467,102 +487,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "48077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x48077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "69c96b327c76fb2dcb54c7704bbedab6478198f0fe9d6fc9aeca8e5cc5dead8b",
+        "lastblockhash" : "0x0a5b7322f331fee32f65670de3432b461c0989a61a00746d057ac8307618e42b",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcall_100_OOGMAfter_3_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcall_100_OOGMAfter_3_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0155fd",
+                    "hash" : "0x81605bcb6e308d55bfd445b84043f1d57e64f8f24e4cddb76c511a6228d39003",
+                    "mixHash" : "0xc306a780cac8f6421f626539104302a44cece4e8b48473d93b3dc10893110881",
+                    "nonce" : "0x013e7f14dde298d1",
+                    "number" : "0x01",
+                    "parentHash" : "0x48077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0xb6e7fffb6aa56ee0988357a7b2e2679bb92808eba6809af8ecfe5e5d7ce9ee41",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a048077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6e7fffb6aa56ee0988357a7b2e2679bb92808eba6809af8ecfe5e5d7ce9ee41a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0c306a780cac8f6421f626539104302a44cece4e8b48473d93b3dc1089311088188013e7f14dde298d1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x48077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x81605bcb6e308d55bfd445b84043f1d57e64f8f24e4cddb76c511a6228d39003",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555fd",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa03",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1_d0g0v0.json
index 6361c6969..3759f775b 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcallcode_101_OOGMAfter_1_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "65531402a6b7bd1dcd597fd13ee1bf220ca8f861aa717dae15c3fbb1297aff0b",
-                    "mixHash" : "bd0cab0e88655df7773341ba6c79f7bb6b0c76ef4506b86e6712c1cef6d9241f",
-                    "nonce" : "56badccc2b31bb5c",
+                    "hash" : "0x650905e6e639dbd3dbe56f60939b1b14c15c02e1e53fcd6bb9ca36399bbb8caf",
+                    "mixHash" : "0x88ff4b483db4f1e0238ff4bf10d2390f8ed1210cd0cc9354f14799848caaa335",
+                    "nonce" : "0x35b3318b1d9bda2f",
                     "number" : "0x01",
-                    "parentHash" : "466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9",
-                    "receiptTrie" : "04c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24",
-                    "stateRoot" : "5eaced69efe1c7081e4092c09c858d0ef1f22b4a7a6a55035aaefdbcec2518f3",
+                    "parentHash" : "0x466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9",
+                    "receiptTrie" : "0x04c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24",
+                    "stateRoot" : "0x5eaced69efe1c7081e4092c09c858d0ef1f22b4a7a6a55035aaefdbcec2518f3",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eaced69efe1c7081e4092c09c858d0ef1f22b4a7a6a55035aaefdbcec2518f3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0bd0cab0e88655df7773341ba6c79f7bb6b0c76ef4506b86e6712c1cef6d9241f8856badccc2b31bb5cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eaced69efe1c7081e4092c09c858d0ef1f22b4a7a6a55035aaefdbcec2518f3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a088ff4b483db4f1e0238ff4bf10d2390f8ed1210cd0cc9354f14799848caaa3358835b3318b1d9bda2ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "91bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x91bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "65531402a6b7bd1dcd597fd13ee1bf220ca8f861aa717dae15c3fbb1297aff0b",
+        "lastblockhash" : "0x650905e6e639dbd3dbe56f60939b1b14c15c02e1e53fcd6bb9ca36399bbb8caf",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcodecallcallcode_101_OOGMAfter_1_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "92ca9f37aea717886ec5ca182acd6a5b5f4adf8c97aa620c5dd7e0a7017d5514",
-                    "mixHash" : "52d993276dd0038a7c1394e4d0f2ea92ebe41da595da440a8aa0bf7ffbc7bf3c",
-                    "nonce" : "d2b30e403b0707ac",
+                    "hash" : "0x27ffc9e8c8badb045e8ca30cabc591e0f2a831a6d03ecb8419c25267f1b22db8",
+                    "mixHash" : "0x63f8a606e6a9cd0441ac26711aa5cfd94330072856ea9e2baa3409efa32b5cf8",
+                    "nonce" : "0xee084de5aef8c4ec",
                     "number" : "0x01",
-                    "parentHash" : "466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9",
-                    "receiptTrie" : "04c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24",
-                    "stateRoot" : "5eaced69efe1c7081e4092c09c858d0ef1f22b4a7a6a55035aaefdbcec2518f3",
+                    "parentHash" : "0x466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9",
+                    "receiptTrie" : "0x04c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24",
+                    "stateRoot" : "0x5eaced69efe1c7081e4092c09c858d0ef1f22b4a7a6a55035aaefdbcec2518f3",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eaced69efe1c7081e4092c09c858d0ef1f22b4a7a6a55035aaefdbcec2518f3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a052d993276dd0038a7c1394e4d0f2ea92ebe41da595da440a8aa0bf7ffbc7bf3c88d2b30e403b0707acf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eaced69efe1c7081e4092c09c858d0ef1f22b4a7a6a55035aaefdbcec2518f3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a063f8a606e6a9cd0441ac26711aa5cfd94330072856ea9e2baa3409efa32b5cf888ee084de5aef8c4ecf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "91bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x91bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "92ca9f37aea717886ec5ca182acd6a5b5f4adf8c97aa620c5dd7e0a7017d5514",
+        "lastblockhash" : "0x27ffc9e8c8badb045e8ca30cabc591e0f2a831a6d03ecb8419c25267f1b22db8",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcodecallcallcode_101_OOGMAfter_1_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "2811674a1f867f6fa78c0f1728ea140597a0b8f8327ed0f0b22a3da617676dcc",
-                    "mixHash" : "ede637c7343c06bfa979c6bd1700d10525e50786bc7a77e1334a081b44150004",
-                    "nonce" : "5384975c9b64a608",
+                    "hash" : "0x26ec1dbe16fb333503313e16cf155d90b12b7c63617e34f8b2cf464928a7fc4f",
+                    "mixHash" : "0x6af12537102c0b4f81aa7eb5f73ec95f0528aa88245242dbdcabc182553789d6",
+                    "nonce" : "0x369efee1f4f65f17",
                     "number" : "0x01",
-                    "parentHash" : "466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9",
-                    "receiptTrie" : "04e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95",
-                    "stateRoot" : "b490d128911d251c1328732584493fc2d2fe3a43933ab64e22e7f531e9133199",
+                    "parentHash" : "0x466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9",
+                    "receiptTrie" : "0x04e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95",
+                    "stateRoot" : "0xb490d128911d251c1328732584493fc2d2fe3a43933ab64e22e7f531e9133199",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b490d128911d251c1328732584493fc2d2fe3a43933ab64e22e7f531e9133199a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0ede637c7343c06bfa979c6bd1700d10525e50786bc7a77e1334a081b44150004885384975c9b64a608f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b490d128911d251c1328732584493fc2d2fe3a43933ab64e22e7f531e9133199a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a06af12537102c0b4f81aa7eb5f73ec95f0528aa88245242dbdcabc182553789d688369efee1f4f65f17f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,102 +340,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "91bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x91bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "2811674a1f867f6fa78c0f1728ea140597a0b8f8327ed0f0b22a3da617676dcc",
+        "lastblockhash" : "0x26ec1dbe16fb333503313e16cf155d90b12b7c63617e34f8b2cf464928a7fc4f",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -428,36 +443,41 @@
         }
     },
     "callcodecallcallcode_101_OOGMAfter_1_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "3f3f8e0b888e934e16f5aaba1ea73d4a405fa48be1aba27f5b655175c837383f",
-                    "mixHash" : "b28e87039e484069d62caa4c2dafdf5f9c1877c39b6598c6c2ac79ee6395184b",
-                    "nonce" : "d34b6c6545554596",
+                    "hash" : "0x72b82e4ee5dece46533ca76c37d5758b30dc3f02a505d64bf6d0adbf9de3b5a3",
+                    "mixHash" : "0x8da932604f1a9da36dfb407ef220fb3b4bd91fb05758511fced5e5250fa27ff0",
+                    "nonce" : "0xd5a90dfb09ceca2c",
                     "number" : "0x01",
-                    "parentHash" : "466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9",
-                    "receiptTrie" : "04e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95",
-                    "stateRoot" : "b490d128911d251c1328732584493fc2d2fe3a43933ab64e22e7f531e9133199",
+                    "parentHash" : "0x466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9",
+                    "receiptTrie" : "0x04e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95",
+                    "stateRoot" : "0xb490d128911d251c1328732584493fc2d2fe3a43933ab64e22e7f531e9133199",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b490d128911d251c1328732584493fc2d2fe3a43933ab64e22e7f531e9133199a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0b28e87039e484069d62caa4c2dafdf5f9c1877c39b6598c6c2ac79ee6395184b88d34b6c6545554596f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b490d128911d251c1328732584493fc2d2fe3a43933ab64e22e7f531e9133199a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a08da932604f1a9da36dfb407ef220fb3b4bd91fb05758511fced5e5250fa27ff088d5a90dfb09ceca2cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -467,102 +487,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "91bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x91bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "3f3f8e0b888e934e16f5aaba1ea73d4a405fa48be1aba27f5b655175c837383f",
+        "lastblockhash" : "0x72b82e4ee5dece46533ca76c37d5758b30dc3f02a505d64bf6d0adbf9de3b5a3",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcallcode_101_OOGMAfter_1_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0155fd",
+                    "hash" : "0x0be65e9fbe9d868b0acd2e7e3d880dc07eb8eee4caf17f0120e76c8b03ffc12e",
+                    "mixHash" : "0x597a691cc37230dbd9e8aade18cf6b51ad1e6f28ece2c4ef80b2cb779d7eb2f8",
+                    "nonce" : "0xd461f7134de33f8e",
+                    "number" : "0x01",
+                    "parentHash" : "0x466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0x74862d483d67e69033b7fa05a307ab72d9f4671dead4487675e125b3f0b4f5e9",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa074862d483d67e69033b7fa05a307ab72d9f4671dead4487675e125b3f0b4f5e9a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0597a691cc37230dbd9e8aade18cf6b51ad1e6f28ece2c4ef80b2cb779d7eb2f888d461f7134de33f8ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x91bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0be65e9fbe9d868b0acd2e7e3d880dc07eb8eee4caf17f0120e76c8b03ffc12e",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555fd",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa03",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2_d0g0v0.json
index e383007f5..7c76bc6df 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcallcode_101_OOGMAfter_2_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155ff",
-                    "hash" : "41a326364a44db3f374ecc7cdab5d64af5f110dfcd4a1df16fd4d1e81e735e8e",
-                    "mixHash" : "afb656c731915aeab28ed563f9e057765956e5894e9d8289177b2693c967c710",
-                    "nonce" : "b7e4e3dc31251f04",
+                    "hash" : "0xbe30d31a2187bef10485cae1dc2bbcaa8fd3d5fb2fd272a08db2ac70c15325e2",
+                    "mixHash" : "0x36cda755444986b5bfa82f24fe16be8324a4ab03830be99a7122658a62b6808b",
+                    "nonce" : "0x3dbad6ff37845e2b",
                     "number" : "0x01",
-                    "parentHash" : "a5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015",
-                    "receiptTrie" : "c8e92577ec9ad352d64d260daa14f1a2df767271828d6cb565d692d8916d1f11",
-                    "stateRoot" : "92c76c3ab5142ae8f1fc2e69609e4af4febffa1bea15d9a60ddc3813316e90a6",
+                    "parentHash" : "0xa5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015",
+                    "receiptTrie" : "0xc8e92577ec9ad352d64d260daa14f1a2df767271828d6cb565d692d8916d1f11",
+                    "stateRoot" : "0x92c76c3ab5142ae8f1fc2e69609e4af4febffa1bea15d9a60ddc3813316e90a6",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa092c76c3ab5142ae8f1fc2e69609e4af4febffa1bea15d9a60ddc3813316e90a6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c8e92577ec9ad352d64d260daa14f1a2df767271828d6cb565d692d8916d1f11b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155ff8203e880a0afb656c731915aeab28ed563f9e057765956e5894e9d8289177b2693c967c71088b7e4e3dc31251f04f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0a5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa092c76c3ab5142ae8f1fc2e69609e4af4febffa1bea15d9a60ddc3813316e90a6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c8e92577ec9ad352d64d260daa14f1a2df767271828d6cb565d692d8916d1f11b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155ff8203e880a036cda755444986b5bfa82f24fe16be8324a4ab03830be99a7122658a62b6808b883dbad6ff37845e2bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "a5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b6e3d55d5419754de209b45f7a60826251010d7bbb3c9b2b62c440c98da53b2f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb6e3d55d5419754de209b45f7a60826251010d7bbb3c9b2b62c440c98da53b2f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6e3d55d5419754de209b45f7a60826251010d7bbb3c9b2b62c440c98da53b2fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "41a326364a44db3f374ecc7cdab5d64af5f110dfcd4a1df16fd4d1e81e735e8e",
+        "lastblockhash" : "0xbe30d31a2187bef10485cae1dc2bbcaa8fd3d5fb2fd272a08db2ac70c15325e2",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555ff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcodecallcallcode_101_OOGMAfter_2_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155ff",
-                    "hash" : "6f92b0178e874356313027e5a32bd08f45f6c893409cc373c57732cc5f52206c",
-                    "mixHash" : "d839112679db35de4ce9f4a360839314a838252d1072c729714b44fcb2230929",
-                    "nonce" : "3e19bf8937090e1e",
+                    "hash" : "0xf3ff246c018f76639f5b900d7db3f04faed7c4a373942f0366b629b8c49aa9e2",
+                    "mixHash" : "0x450b42ecec2534915c76fe072013c5ce177cff841808ad0d08bc12b4d832076c",
+                    "nonce" : "0x17f85fc976f9412a",
                     "number" : "0x01",
-                    "parentHash" : "a5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015",
-                    "receiptTrie" : "c8e92577ec9ad352d64d260daa14f1a2df767271828d6cb565d692d8916d1f11",
-                    "stateRoot" : "92c76c3ab5142ae8f1fc2e69609e4af4febffa1bea15d9a60ddc3813316e90a6",
+                    "parentHash" : "0xa5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015",
+                    "receiptTrie" : "0xc8e92577ec9ad352d64d260daa14f1a2df767271828d6cb565d692d8916d1f11",
+                    "stateRoot" : "0x92c76c3ab5142ae8f1fc2e69609e4af4febffa1bea15d9a60ddc3813316e90a6",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa092c76c3ab5142ae8f1fc2e69609e4af4febffa1bea15d9a60ddc3813316e90a6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c8e92577ec9ad352d64d260daa14f1a2df767271828d6cb565d692d8916d1f11b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155ff8203e880a0d839112679db35de4ce9f4a360839314a838252d1072c729714b44fcb2230929883e19bf8937090e1ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0a5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa092c76c3ab5142ae8f1fc2e69609e4af4febffa1bea15d9a60ddc3813316e90a6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c8e92577ec9ad352d64d260daa14f1a2df767271828d6cb565d692d8916d1f11b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155ff8203e880a0450b42ecec2534915c76fe072013c5ce177cff841808ad0d08bc12b4d832076c8817f85fc976f9412af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "a5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b6e3d55d5419754de209b45f7a60826251010d7bbb3c9b2b62c440c98da53b2f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb6e3d55d5419754de209b45f7a60826251010d7bbb3c9b2b62c440c98da53b2f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6e3d55d5419754de209b45f7a60826251010d7bbb3c9b2b62c440c98da53b2fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "6f92b0178e874356313027e5a32bd08f45f6c893409cc373c57732cc5f52206c",
+        "lastblockhash" : "0xf3ff246c018f76639f5b900d7db3f04faed7c4a373942f0366b629b8c49aa9e2",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555ff",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa01",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcodecallcallcode_101_OOGMAfter_2_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "694045419783043312f7d2bf0c29987ab0da432127b0716ff4cb18fc02e320fb",
-                    "mixHash" : "86cc9e4f4ff092024b1ce34350db00d95f31d453b6a0d15aa45fc9d500cceae0",
-                    "nonce" : "8e6233416a334eed",
+                    "hash" : "0x8083f2c4faf30eeae4085211ea1d34eebfd2750c5be2e2598ab0d3ba15d45574",
+                    "mixHash" : "0xec19ae10c654b5bd6694e6ced867e27f502b55d39f9ac0c1cdf1813625ce2472",
+                    "nonce" : "0x3fd88ec5d73c0aee",
                     "number" : "0x01",
-                    "parentHash" : "a5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015",
-                    "receiptTrie" : "35d2c1620446175fe04bd2e38f488615f0476e6f412a858f374997ffa88cd2b5",
-                    "stateRoot" : "383714aa98a691acdccf099e46648052b45ce6dd8ca97ccd346660a9e7dcc3e4",
+                    "parentHash" : "0xa5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015",
+                    "receiptTrie" : "0x35d2c1620446175fe04bd2e38f488615f0476e6f412a858f374997ffa88cd2b5",
+                    "stateRoot" : "0x383714aa98a691acdccf099e46648052b45ce6dd8ca97ccd346660a9e7dcc3e4",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0383714aa98a691acdccf099e46648052b45ce6dd8ca97ccd346660a9e7dcc3e4a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea035d2c1620446175fe04bd2e38f488615f0476e6f412a858f374997ffa88cd2b5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a086cc9e4f4ff092024b1ce34350db00d95f31d453b6a0d15aa45fc9d500cceae0888e6233416a334eedf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0a5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0383714aa98a691acdccf099e46648052b45ce6dd8ca97ccd346660a9e7dcc3e4a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea035d2c1620446175fe04bd2e38f488615f0476e6f412a858f374997ffa88cd2b5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a0ec19ae10c654b5bd6694e6ced867e27f502b55d39f9ac0c1cdf1813625ce2472883fd88ec5d73c0aeef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,102 +340,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "a5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b6e3d55d5419754de209b45f7a60826251010d7bbb3c9b2b62c440c98da53b2f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb6e3d55d5419754de209b45f7a60826251010d7bbb3c9b2b62c440c98da53b2f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6e3d55d5419754de209b45f7a60826251010d7bbb3c9b2b62c440c98da53b2fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "694045419783043312f7d2bf0c29987ab0da432127b0716ff4cb18fc02e320fb",
+        "lastblockhash" : "0x8083f2c4faf30eeae4085211ea1d34eebfd2750c5be2e2598ab0d3ba15d45574",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f69fe0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7616020",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -428,36 +443,41 @@
         }
     },
     "callcodecallcallcode_101_OOGMAfter_2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150c9",
-                    "hash" : "abdcfdfe7616b3fef13b1d2c491592937d84cc157cfe287a25264b61af32e622",
-                    "mixHash" : "82685cf36419e8885a7289a821129a6ac354a30c2455e7503760ee4a50f5c631",
-                    "nonce" : "7b7fa6a307c554e1",
+                    "hash" : "0x749007121b296265bf49031a2bcc7ab5e4b4926cac9f58619244a9bded39c491",
+                    "mixHash" : "0x4aa5947895589198d7d392276504684f9e83475da8210c40520f3d962ab8c764",
+                    "nonce" : "0x7a084e7224058c27",
                     "number" : "0x01",
-                    "parentHash" : "a5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015",
-                    "receiptTrie" : "103cd4aa2e002867e45d81282907befbf9ca183c1a6816f94cb1e78b8c39f206",
-                    "stateRoot" : "3e9206d98842c36b016825e42ca5ba02f2644586033ecd10b646180572a11019",
+                    "parentHash" : "0xa5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015",
+                    "receiptTrie" : "0x103cd4aa2e002867e45d81282907befbf9ca183c1a6816f94cb1e78b8c39f206",
+                    "stateRoot" : "0x3e9206d98842c36b016825e42ca5ba02f2644586033ecd10b646180572a11019",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e9206d98842c36b016825e42ca5ba02f2644586033ecd10b646180572a11019a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0103cd4aa2e002867e45d81282907befbf9ca183c1a6816f94cb1e78b8c39f206b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c98203e880a082685cf36419e8885a7289a821129a6ac354a30c2455e7503760ee4a50f5c631887b7fa6a307c554e1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0a5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e9206d98842c36b016825e42ca5ba02f2644586033ecd10b646180572a11019a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0103cd4aa2e002867e45d81282907befbf9ca183c1a6816f94cb1e78b8c39f206b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c98203e880a04aa5947895589198d7d392276504684f9e83475da8210c40520f3d962ab8c764887a084e7224058c27f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -467,102 +487,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "a5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "b6e3d55d5419754de209b45f7a60826251010d7bbb3c9b2b62c440c98da53b2f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb6e3d55d5419754de209b45f7a60826251010d7bbb3c9b2b62c440c98da53b2f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6e3d55d5419754de209b45f7a60826251010d7bbb3c9b2b62c440c98da53b2fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "abdcfdfe7616b3fef13b1d2c491592937d84cc157cfe287a25264b61af32e622",
+        "lastblockhash" : "0x749007121b296265bf49031a2bcc7ab5e4b4926cac9f58619244a9bded39c491",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550c9",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af37",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f26001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcallcode_101_OOGMAfter_2_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0155ff",
+                    "hash" : "0xa5edf5291f359afa3227d0643f5df22eb9f37dfc87b3d5bc7ffee88745eccbcd",
+                    "mixHash" : "0x67461c5ddbdfcc5903a4ac36f7142b1b43703c19d71a10259309992f76292ebe",
+                    "nonce" : "0x5e0990dec9df9f8d",
+                    "number" : "0x01",
+                    "parentHash" : "0xa5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015",
+                    "receiptTrie" : "0x904ef34262912ab9ed82ebe8efcc7e7d10f885cb2a54713e6772e69cbee8b33c",
+                    "stateRoot" : "0x63d3b04cff5e62b4545a56a6fa78c3be868d8d45e0750d78be315e93de9d71b4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0a5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa063d3b04cff5e62b4545a56a6fa78c3be868d8d45e0750d78be315e93de9d71b4a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0904ef34262912ab9ed82ebe8efcc7e7d10f885cb2a54713e6772e69cbee8b33cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155ff8203e880a067461c5ddbdfcc5903a4ac36f7142b1b43703c19d71a10259309992f76292ebe885e0990dec9df9f8df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xa5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xb6e3d55d5419754de209b45f7a60826251010d7bbb3c9b2b62c440c98da53b2f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6e3d55d5419754de209b45f7a60826251010d7bbb3c9b2b62c440c98da53b2fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa5edf5291f359afa3227d0643f5df22eb9f37dfc87b3d5bc7ffee88745eccbcd",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f26001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555ff",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa01",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c95f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3_d0g0v0.json
index bd64f8440..4a4636b7b 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcallcode_101_OOGMAfter_3_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fa",
-                    "hash" : "794214a365ca0c090b2205f8e46e2a7aae23b3ad4666a7accbb22ce71235a0b5",
-                    "mixHash" : "d87ba855eeb9475cef5390e4e0c3460f43d0f112df24a1fc26fb5ebcdbc4445a",
-                    "nonce" : "427c3a955ebd78b0",
+                    "hash" : "0x7a097d4c427e2fe0204f8795cd8336810d4ad3cd15336cb7200f430968d49413",
+                    "mixHash" : "0xd94037892e4a8bd6b07414d70060ae42b3bac6485fa1d5859163292158b029e9",
+                    "nonce" : "0xa74f92dc24704456",
                     "number" : "0x01",
-                    "parentHash" : "2ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512be",
-                    "receiptTrie" : "9afc32c9268c7f1654ad4d462857d898cf830ad541a88890f9b514e8c93813aa",
-                    "stateRoot" : "1e9534f8fbf73e256ac03b54feb61c3c932364dab0a60b30b9566e7e8ce080ad",
+                    "parentHash" : "0x2ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512be",
+                    "receiptTrie" : "0x9afc32c9268c7f1654ad4d462857d898cf830ad541a88890f9b514e8c93813aa",
+                    "stateRoot" : "0x1e9534f8fbf73e256ac03b54feb61c3c932364dab0a60b30b9566e7e8ce080ad",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a02ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01e9534f8fbf73e256ac03b54feb61c3c932364dab0a60b30b9566e7e8ce080ada0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09afc32c9268c7f1654ad4d462857d898cf830ad541a88890f9b514e8c93813aab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a0d87ba855eeb9475cef5390e4e0c3460f43d0f112df24a1fc26fb5ebcdbc4445a88427c3a955ebd78b0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a02ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01e9534f8fbf73e256ac03b54feb61c3c932364dab0a60b30b9566e7e8ce080ada0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09afc32c9268c7f1654ad4d462857d898cf830ad541a88890f9b514e8c93813aab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a0d94037892e4a8bd6b07414d70060ae42b3bac6485fa1d5859163292158b029e988a74f92dc24704456f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "2ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512be",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x2ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512be",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c1b3e2ee0d83629e84e64f0429d9df8fe6c2b8d8df1cce7870afde605f4fd61b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc1b3e2ee0d83629e84e64f0429d9df8fe6c2b8d8df1cce7870afde605f4fd61b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1b3e2ee0d83629e84e64f0429d9df8fe6c2b8d8df1cce7870afde605f4fd61ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "794214a365ca0c090b2205f8e46e2a7aae23b3ad4666a7accbb22ce71235a0b5",
+        "lastblockhash" : "0x7a097d4c427e2fe0204f8795cd8336810d4ad3cd15336cb7200f430968d49413",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fa",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa06",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcodecallcallcode_101_OOGMAfter_3_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fa",
-                    "hash" : "d087094814a2f97b576a1d46b378c86161e02b7e5bd95085095636b16a8ba66f",
-                    "mixHash" : "090b2d2b8b651560d21546c4ec1c99b2a9ee674d89de56a94c339ddf7f1fb8fb",
-                    "nonce" : "dbf44dd78fa999dd",
+                    "hash" : "0x966e457383b4940c2a513a5dba5224c95c3dfe338ae3cebd09d471cf0041ec6f",
+                    "mixHash" : "0x72cce8e82e3f89b68cb6363c16c6e8d7fb721e798aa4bc76b18f5ba6239834f1",
+                    "nonce" : "0x23f278e99389fc38",
                     "number" : "0x01",
-                    "parentHash" : "2ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512be",
-                    "receiptTrie" : "9afc32c9268c7f1654ad4d462857d898cf830ad541a88890f9b514e8c93813aa",
-                    "stateRoot" : "1e9534f8fbf73e256ac03b54feb61c3c932364dab0a60b30b9566e7e8ce080ad",
+                    "parentHash" : "0x2ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512be",
+                    "receiptTrie" : "0x9afc32c9268c7f1654ad4d462857d898cf830ad541a88890f9b514e8c93813aa",
+                    "stateRoot" : "0x1e9534f8fbf73e256ac03b54feb61c3c932364dab0a60b30b9566e7e8ce080ad",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a02ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01e9534f8fbf73e256ac03b54feb61c3c932364dab0a60b30b9566e7e8ce080ada0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09afc32c9268c7f1654ad4d462857d898cf830ad541a88890f9b514e8c93813aab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a0090b2d2b8b651560d21546c4ec1c99b2a9ee674d89de56a94c339ddf7f1fb8fb88dbf44dd78fa999ddf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a02ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01e9534f8fbf73e256ac03b54feb61c3c932364dab0a60b30b9566e7e8ce080ada0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09afc32c9268c7f1654ad4d462857d898cf830ad541a88890f9b514e8c93813aab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a072cce8e82e3f89b68cb6363c16c6e8d7fb721e798aa4bc76b18f5ba6239834f18823f278e99389fc38f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "2ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512be",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x2ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512be",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c1b3e2ee0d83629e84e64f0429d9df8fe6c2b8d8df1cce7870afde605f4fd61b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc1b3e2ee0d83629e84e64f0429d9df8fe6c2b8d8df1cce7870afde605f4fd61b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1b3e2ee0d83629e84e64f0429d9df8fe6c2b8d8df1cce7870afde605f4fd61ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d087094814a2f97b576a1d46b378c86161e02b7e5bd95085095636b16a8ba66f",
+        "lastblockhash" : "0x966e457383b4940c2a513a5dba5224c95c3dfe338ae3cebd09d471cf0041ec6f",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fa",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa06",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcodecallcallcode_101_OOGMAfter_3_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "6f7ab000aef0aa8797ca488f81f541b91d585057df7d284ef0f69397914faf44",
-                    "mixHash" : "187c619b78af785bb486ab10b15f3e1079b4bb712dba2eaa1e188959ae5d594a",
-                    "nonce" : "c8f3a4bd9fad57e4",
+                    "hash" : "0xe598e147ef47e164397f119868fe5f15ffe3e2ec2a7c42bae831928ff7fb1ad8",
+                    "mixHash" : "0xdbb4c7b7fa56ca8f85584ba068af41661b469b6cfe95034902d0a69a79230205",
+                    "nonce" : "0x8308def96b9df5af",
                     "number" : "0x01",
-                    "parentHash" : "2ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512be",
-                    "receiptTrie" : "65351559b0343f656ee81bb0eb21256b6886ad6b68f0378223d3e14bb5566db7",
-                    "stateRoot" : "cd311d29d93f911559d4302751ccc79023fdf08ebbd5857112fa38cfcb68bddb",
+                    "parentHash" : "0x2ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512be",
+                    "receiptTrie" : "0x65351559b0343f656ee81bb0eb21256b6886ad6b68f0378223d3e14bb5566db7",
+                    "stateRoot" : "0xcd311d29d93f911559d4302751ccc79023fdf08ebbd5857112fa38cfcb68bddb",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a02ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cd311d29d93f911559d4302751ccc79023fdf08ebbd5857112fa38cfcb68bddba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea065351559b0343f656ee81bb0eb21256b6886ad6b68f0378223d3e14bb5566db7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a0187c619b78af785bb486ab10b15f3e1079b4bb712dba2eaa1e188959ae5d594a88c8f3a4bd9fad57e4f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a02ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cd311d29d93f911559d4302751ccc79023fdf08ebbd5857112fa38cfcb68bddba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea065351559b0343f656ee81bb0eb21256b6886ad6b68f0378223d3e14bb5566db7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a0dbb4c7b7fa56ca8f85584ba068af41661b469b6cfe95034902d0a69a79230205888308def96b9df5aff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,102 +340,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "2ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512be",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x2ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512be",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c1b3e2ee0d83629e84e64f0429d9df8fe6c2b8d8df1cce7870afde605f4fd61b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc1b3e2ee0d83629e84e64f0429d9df8fe6c2b8d8df1cce7870afde605f4fd61b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1b3e2ee0d83629e84e64f0429d9df8fe6c2b8d8df1cce7870afde605f4fd61ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "6f7ab000aef0aa8797ca488f81f541b91d585057df7d284ef0f69397914faf44",
+        "lastblockhash" : "0xe598e147ef47e164397f119868fe5f15ffe3e2ec2a7c42bae831928ff7fb1ad8",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f69fe0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7616020",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -428,36 +443,41 @@
         }
     },
     "callcodecallcallcode_101_OOGMAfter_3_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150c9",
-                    "hash" : "619a6d28057ec861179cec6a566dcbe611bebb7ea7e603e0a6c77d7b7f2279eb",
-                    "mixHash" : "9b47777666886fff704f3d5cd31a9fc4bd14b6ade758cf9b446a95d2533ea4c2",
-                    "nonce" : "8db26f40956acefd",
+                    "hash" : "0x442903db999486b5ba2a62c69c8d8abedcef09c9e502eff3551e103f80c49ad7",
+                    "mixHash" : "0x8d1c9e9c0e1c328d585a2aa15d3519240d32a099dfa341f8e5ef072b254397fd",
+                    "nonce" : "0x94ae2efecadca98f",
                     "number" : "0x01",
-                    "parentHash" : "2ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512be",
-                    "receiptTrie" : "fd79d5239586bfadf7bc3e424a2e1c0d6c9b8b29fb24aa835329e05d38de6beb",
-                    "stateRoot" : "0fbacbeed8fef433fd65da12f682e0d251262ae903b7af6d4073fe040d507e3e",
+                    "parentHash" : "0x2ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512be",
+                    "receiptTrie" : "0xfd79d5239586bfadf7bc3e424a2e1c0d6c9b8b29fb24aa835329e05d38de6beb",
+                    "stateRoot" : "0x0fbacbeed8fef433fd65da12f682e0d251262ae903b7af6d4073fe040d507e3e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a02ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fbacbeed8fef433fd65da12f682e0d251262ae903b7af6d4073fe040d507e3ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fd79d5239586bfadf7bc3e424a2e1c0d6c9b8b29fb24aa835329e05d38de6bebb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c98203e880a09b47777666886fff704f3d5cd31a9fc4bd14b6ade758cf9b446a95d2533ea4c2888db26f40956acefdf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a02ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fbacbeed8fef433fd65da12f682e0d251262ae903b7af6d4073fe040d507e3ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fd79d5239586bfadf7bc3e424a2e1c0d6c9b8b29fb24aa835329e05d38de6bebb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c98203e880a08d1c9e9c0e1c328d585a2aa15d3519240d32a099dfa341f8e5ef072b254397fd8894ae2efecadca98ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -467,102 +487,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "2ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512be",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x2ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512be",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "c1b3e2ee0d83629e84e64f0429d9df8fe6c2b8d8df1cce7870afde605f4fd61b",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc1b3e2ee0d83629e84e64f0429d9df8fe6c2b8d8df1cce7870afde605f4fd61b",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1b3e2ee0d83629e84e64f0429d9df8fe6c2b8d8df1cce7870afde605f4fd61ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "619a6d28057ec861179cec6a566dcbe611bebb7ea7e603e0a6c77d7b7f2279eb",
+        "lastblockhash" : "0x442903db999486b5ba2a62c69c8d8abedcef09c9e502eff3551e103f80c49ad7",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550c9",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af37",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcallcode_101_OOGMAfter_3_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0155fa",
+                    "hash" : "0x654849a77135648059a6f3a5d0aff82efb1b64d4d93008b1c7424ca0c8569670",
+                    "mixHash" : "0x6ddfbec27482fbee3896e4eb6afa17b4702d00e2a45de9a8e0329f0190b464d3",
+                    "nonce" : "0xb783e301477c2bd2",
+                    "number" : "0x01",
+                    "parentHash" : "0x2ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512be",
+                    "receiptTrie" : "0x9c15c271a51ae8f1007b852a5c63f8adccff1dafb06f5a58921c871c65abaff9",
+                    "stateRoot" : "0x41270ae8d38123a1f955b7c7dbfcf85444fd4a3b96d0660406ed1fdebd36f96f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a02ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041270ae8d38123a1f955b7c7dbfcf85444fd4a3b96d0660406ed1fdebd36f96fa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09c15c271a51ae8f1007b852a5c63f8adccff1dafb06f5a58921c871c65abaff9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a06ddfbec27482fbee3896e4eb6afa17b4702d00e2a45de9a8e0329f0190b464d388b783e301477c2bd2f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x2ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512be",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xc1b3e2ee0d83629e84e64f0429d9df8fe6c2b8d8df1cce7870afde605f4fd61b",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1b3e2ee0d83629e84e64f0429d9df8fe6c2b8d8df1cce7870afde605f4fd61ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x654849a77135648059a6f3a5d0aff82efb1b64d4d93008b1c7424ca0c8569670",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555fa",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa06",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f16001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1_d0g0v0.json
index bb289e80f..345e26086 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcodecall_110_OOGMAfter_1_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fc",
-                    "hash" : "7c0baa83a3ac28800975c38a7fcff302e136e10602dec3db7d58626e3516863b",
-                    "mixHash" : "c2802d24dd39c2a4985b1cad68ac2ec4a29ea2a5e3215e0638961237142c602b",
-                    "nonce" : "e3521d4b13832366",
+                    "hash" : "0xba3975ce8806f927b28e56660c4fac27a1ca6923fdb8cbd2051958e7fe9521c4",
+                    "mixHash" : "0xe2491a19b646ffbfd00b3f4f9b63affee670986436b5e58cd248facb410bede5",
+                    "nonce" : "0xe27b25defb865fb6",
                     "number" : "0x01",
-                    "parentHash" : "e7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cd",
-                    "receiptTrie" : "97801756c9427bd2cd37ffc50bb252a2df3007a9eefc02179d701a16a8097ad2",
-                    "stateRoot" : "e49c1496075bee37dc339ead53d7fdf2f0caa5e9bb991363c9a74c7c80e544c3",
+                    "parentHash" : "0xe7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cd",
+                    "receiptTrie" : "0x97801756c9427bd2cd37ffc50bb252a2df3007a9eefc02179d701a16a8097ad2",
+                    "stateRoot" : "0xe49c1496075bee37dc339ead53d7fdf2f0caa5e9bb991363c9a74c7c80e544c3",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e49c1496075bee37dc339ead53d7fdf2f0caa5e9bb991363c9a74c7c80e544c3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea097801756c9427bd2cd37ffc50bb252a2df3007a9eefc02179d701a16a8097ad2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fc8203e880a0c2802d24dd39c2a4985b1cad68ac2ec4a29ea2a5e3215e0638961237142c602b88e3521d4b13832366f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0e7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e49c1496075bee37dc339ead53d7fdf2f0caa5e9bb991363c9a74c7c80e544c3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea097801756c9427bd2cd37ffc50bb252a2df3007a9eefc02179d701a16a8097ad2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fc8203e880a0e2491a19b646ffbfd00b3f4f9b63affee670986436b5e58cd248facb410bede588e27b25defb865fb6f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "e7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cd",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0777b1de84fbc82ba1a400a21de5411568c963ed24f7f4b3b98811bcf38029fe",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0777b1de84fbc82ba1a400a21de5411568c963ed24f7f4b3b98811bcf38029fe",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00777b1de84fbc82ba1a400a21de5411568c963ed24f7f4b3b98811bcf38029fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "7c0baa83a3ac28800975c38a7fcff302e136e10602dec3db7d58626e3516863b",
+        "lastblockhash" : "0xba3975ce8806f927b28e56660c4fac27a1ca6923fdb8cbd2051958e7fe9521c4",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c95f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa04",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c95f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcodecallcodecall_110_OOGMAfter_1_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fc",
-                    "hash" : "617756fc5a9139f5b7efe11003356012e8e4ba38e029c19873353b7802e4f48b",
-                    "mixHash" : "ed1d78df22914bd2311812adeb75e38999b3347a8b753009f899c24be2ebf5a4",
-                    "nonce" : "67c8ce47bb97e75e",
+                    "hash" : "0x4d5d13bd9a764427e3d9d4bbaacc3df25658a38ca5b0cf74e32e5e6a6c8ba948",
+                    "mixHash" : "0x66062314547eac2c40370174ad1440caa8b7976bf96f2a846222351ce7904db3",
+                    "nonce" : "0xc63972d128d07f04",
                     "number" : "0x01",
-                    "parentHash" : "e7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cd",
-                    "receiptTrie" : "97801756c9427bd2cd37ffc50bb252a2df3007a9eefc02179d701a16a8097ad2",
-                    "stateRoot" : "e49c1496075bee37dc339ead53d7fdf2f0caa5e9bb991363c9a74c7c80e544c3",
+                    "parentHash" : "0xe7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cd",
+                    "receiptTrie" : "0x97801756c9427bd2cd37ffc50bb252a2df3007a9eefc02179d701a16a8097ad2",
+                    "stateRoot" : "0xe49c1496075bee37dc339ead53d7fdf2f0caa5e9bb991363c9a74c7c80e544c3",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e49c1496075bee37dc339ead53d7fdf2f0caa5e9bb991363c9a74c7c80e544c3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea097801756c9427bd2cd37ffc50bb252a2df3007a9eefc02179d701a16a8097ad2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fc8203e880a0ed1d78df22914bd2311812adeb75e38999b3347a8b753009f899c24be2ebf5a48867c8ce47bb97e75ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0e7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e49c1496075bee37dc339ead53d7fdf2f0caa5e9bb991363c9a74c7c80e544c3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea097801756c9427bd2cd37ffc50bb252a2df3007a9eefc02179d701a16a8097ad2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fc8203e880a066062314547eac2c40370174ad1440caa8b7976bf96f2a846222351ce7904db388c63972d128d07f04f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "e7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cd",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0777b1de84fbc82ba1a400a21de5411568c963ed24f7f4b3b98811bcf38029fe",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0777b1de84fbc82ba1a400a21de5411568c963ed24f7f4b3b98811bcf38029fe",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00777b1de84fbc82ba1a400a21de5411568c963ed24f7f4b3b98811bcf38029fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "617756fc5a9139f5b7efe11003356012e8e4ba38e029c19873353b7802e4f48b",
+        "lastblockhash" : "0x4d5d13bd9a764427e3d9d4bbaacc3df25658a38ca5b0cf74e32e5e6a6c8ba948",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c95f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa04",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c95f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcodecallcodecall_110_OOGMAfter_1_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "b31486216c6dc8a370e0017f4856bb8e8c7c2cd46496d26d0aa709a30c6ab181",
-                    "mixHash" : "ae4834319c83dd275a38476f4eec553e86909f3adae633c69a12279f7edfcaea",
-                    "nonce" : "f787266bb3cbaec2",
+                    "hash" : "0x5bdfd36b5eadd1d9eee742e92aee36948b5bb46406c716154bce7e48ee87c35b",
+                    "mixHash" : "0xc3079c15054c74f0540aeaada8a8cef46df0757aa2ecf910d982446a847af4f5",
+                    "nonce" : "0x9db01b85d5fd6b17",
                     "number" : "0x01",
-                    "parentHash" : "e7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cd",
-                    "receiptTrie" : "80b44799302b8e9d406aa6bd1202e2a96199ffd759b95a49361594c13b5d256c",
-                    "stateRoot" : "f3729207adab5a1c3e8b052adc4d30c2c9ca7e84246825ce7879160d0d6f4626",
+                    "parentHash" : "0xe7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cd",
+                    "receiptTrie" : "0x80b44799302b8e9d406aa6bd1202e2a96199ffd759b95a49361594c13b5d256c",
+                    "stateRoot" : "0xf3729207adab5a1c3e8b052adc4d30c2c9ca7e84246825ce7879160d0d6f4626",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3729207adab5a1c3e8b052adc4d30c2c9ca7e84246825ce7879160d0d6f4626a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea080b44799302b8e9d406aa6bd1202e2a96199ffd759b95a49361594c13b5d256cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a0ae4834319c83dd275a38476f4eec553e86909f3adae633c69a12279f7edfcaea88f787266bb3cbaec2f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0e7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3729207adab5a1c3e8b052adc4d30c2c9ca7e84246825ce7879160d0d6f4626a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea080b44799302b8e9d406aa6bd1202e2a96199ffd759b95a49361594c13b5d256cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a0c3079c15054c74f0540aeaada8a8cef46df0757aa2ecf910d982446a847af4f5889db01b85d5fd6b17f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,102 +340,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "e7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cd",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0777b1de84fbc82ba1a400a21de5411568c963ed24f7f4b3b98811bcf38029fe",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0777b1de84fbc82ba1a400a21de5411568c963ed24f7f4b3b98811bcf38029fe",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00777b1de84fbc82ba1a400a21de5411568c963ed24f7f4b3b98811bcf38029fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "b31486216c6dc8a370e0017f4856bb8e8c7c2cd46496d26d0aa709a30c6ab181",
+        "lastblockhash" : "0x5bdfd36b5eadd1d9eee742e92aee36948b5bb46406c716154bce7e48ee87c35b",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c95f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f69fe0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7616020",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c95f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -428,36 +443,41 @@
         }
     },
     "callcodecallcodecall_110_OOGMAfter_1_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150c9",
-                    "hash" : "4c37a2583517671624308a9c27699cc6ef599f6817026088ec0a38eb0d966e7a",
-                    "mixHash" : "f3f208740570ec3327e2e0eb1003cb7c45f465e4f39d574546e179bfd867ea0a",
-                    "nonce" : "2155b78d51f03d7a",
+                    "hash" : "0x5722e19aa97deae2fe6073263de2b3c5c6e220f6daccd8943ccb46abd7503d5b",
+                    "mixHash" : "0xbb8964cfe700e4c9d50d76411019d4ea7bcb9c80e1c2e5bafd70b3a988f6f228",
+                    "nonce" : "0x83433bb3b1b56076",
                     "number" : "0x01",
-                    "parentHash" : "e7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cd",
-                    "receiptTrie" : "f2f8201d3954a240d39c5748d71ba574f27fe834598c581bf765799894b15aa3",
-                    "stateRoot" : "71ad194e1cc957eb5150251f51fe7b1a85c113f1c0087b084968b533dd38e464",
+                    "parentHash" : "0xe7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cd",
+                    "receiptTrie" : "0xf2f8201d3954a240d39c5748d71ba574f27fe834598c581bf765799894b15aa3",
+                    "stateRoot" : "0x71ad194e1cc957eb5150251f51fe7b1a85c113f1c0087b084968b533dd38e464",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa071ad194e1cc957eb5150251f51fe7b1a85c113f1c0087b084968b533dd38e464a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f2f8201d3954a240d39c5748d71ba574f27fe834598c581bf765799894b15aa3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c98203e880a0f3f208740570ec3327e2e0eb1003cb7c45f465e4f39d574546e179bfd867ea0a882155b78d51f03d7af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0e7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa071ad194e1cc957eb5150251f51fe7b1a85c113f1c0087b084968b533dd38e464a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f2f8201d3954a240d39c5748d71ba574f27fe834598c581bf765799894b15aa3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c98203e880a0bb8964cfe700e4c9d50d76411019d4ea7bcb9c80e1c2e5bafd70b3a988f6f2288883433bb3b1b56076f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -467,102 +487,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "e7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cd",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xe7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0777b1de84fbc82ba1a400a21de5411568c963ed24f7f4b3b98811bcf38029fe",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0777b1de84fbc82ba1a400a21de5411568c963ed24f7f4b3b98811bcf38029fe",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00777b1de84fbc82ba1a400a21de5411568c963ed24f7f4b3b98811bcf38029fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "4c37a2583517671624308a9c27699cc6ef599f6817026088ec0a38eb0d966e7a",
+        "lastblockhash" : "0x5722e19aa97deae2fe6073263de2b3c5c6e220f6daccd8943ccb46abd7503d5b",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c95f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550c9",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af37",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c95f46001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcodecall_110_OOGMAfter_1_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0155fc",
+                    "hash" : "0xd5870cc6b8377c37db7f61a43bddcb93842c45da127b48667333a35421e302fc",
+                    "mixHash" : "0xc57c3ed23d559494cada8b6f7247e477f4e72b5b7f8ca84cd3266a4f8d63d0f9",
+                    "nonce" : "0xf9038f486785d0d2",
+                    "number" : "0x01",
+                    "parentHash" : "0xe7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cd",
+                    "receiptTrie" : "0xadfbfdd0bb92dc004bc3dde08ce5b3aeada0bb5a50c9cc31aef4728f50fa6047",
+                    "stateRoot" : "0x93ae68153cdef27d07537b5fc4345755054a8177924f1eeb74d8e3914240c49c",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0e7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa093ae68153cdef27d07537b5fc4345755054a8177924f1eeb74d8e3914240c49ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0adfbfdd0bb92dc004bc3dde08ce5b3aeada0bb5a50c9cc31aef4728f50fa6047b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fc8203e880a0c57c3ed23d559494cada8b6f7247e477f4e72b5b7f8ca84cd3266a4f8d63d0f988f9038f486785d0d2f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xe7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cd",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x0777b1de84fbc82ba1a400a21de5411568c963ed24f7f4b3b98811bcf38029fe",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00777b1de84fbc82ba1a400a21de5411568c963ed24f7f4b3b98811bcf38029fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd5870cc6b8377c37db7f61a43bddcb93842c45da127b48667333a35421e302fc",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c95f46001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555fc",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa04",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c95f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2_d0g0v0.json
index 437ecd038..d2294041b 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcodecall_110_OOGMAfter_2_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155f7",
-                    "hash" : "621639329cbf874d4db03a1b11eeed168e409d7b6bee7d0250ed44e8f64c1f0f",
-                    "mixHash" : "940c14b8fff8053ca999b347fcf5065c95d2b15a2e533d3806bc0b6be780be77",
-                    "nonce" : "32a2335c96de4908",
+                    "hash" : "0xa15ed7fc1c8d89b07aabb792a021f36872a25213576b1155412a7c6701619573",
+                    "mixHash" : "0x364b91e3d59c00cbb9b887268147979e815fe975b95282d28e266f7481573bfd",
+                    "nonce" : "0x9486c534c078463e",
                     "number" : "0x01",
-                    "parentHash" : "11621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3",
-                    "receiptTrie" : "0a50a9b49e2f1295fe83a53ebd32cba572413b0219e84c5a1a2a4a0b38f2cdf1",
-                    "stateRoot" : "820a4a233608aa25d7751046aafd716a104389db4a36812c02eb5978debc5227",
+                    "parentHash" : "0x11621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3",
+                    "receiptTrie" : "0x0a50a9b49e2f1295fe83a53ebd32cba572413b0219e84c5a1a2a4a0b38f2cdf1",
+                    "stateRoot" : "0x820a4a233608aa25d7751046aafd716a104389db4a36812c02eb5978debc5227",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a011621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0820a4a233608aa25d7751046aafd716a104389db4a36812c02eb5978debc5227a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00a50a9b49e2f1295fe83a53ebd32cba572413b0219e84c5a1a2a4a0b38f2cdf1b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a0940c14b8fff8053ca999b347fcf5065c95d2b15a2e533d3806bc0b6be780be778832a2335c96de4908f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a011621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0820a4a233608aa25d7751046aafd716a104389db4a36812c02eb5978debc5227a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00a50a9b49e2f1295fe83a53ebd32cba572413b0219e84c5a1a2a4a0b38f2cdf1b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a0364b91e3d59c00cbb9b887268147979e815fe975b95282d28e266f7481573bfd889486c534c078463ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "11621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x11621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "952c78fad0fdbcb5d406ceb2e903a66c9f794e4da7512335b7dd4eb12bdd4282",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x952c78fad0fdbcb5d406ceb2e903a66c9f794e4da7512335b7dd4eb12bdd4282",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0952c78fad0fdbcb5d406ceb2e903a66c9f794e4da7512335b7dd4eb12bdd4282a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "621639329cbf874d4db03a1b11eeed168e409d7b6bee7d0250ed44e8f64c1f0f",
+        "lastblockhash" : "0xa15ed7fc1c8d89b07aabb792a021f36872a25213576b1155412a7c6701619573",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555f7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa09",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcodecallcodecall_110_OOGMAfter_2_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155f7",
-                    "hash" : "f913ef5c7e6b3cacf37da421e3f4a192978d8407ed1b2d4b73bb135549376c17",
-                    "mixHash" : "0379e7e93d6ba6ea4493d881abdcade8ea4738ffa56aa6147a370e723274bf51",
-                    "nonce" : "1d5f3547feca68cf",
+                    "hash" : "0x6651a0ae64e98ec3a5cef67f7697a340e9a81792d3fc86541346159fba877f03",
+                    "mixHash" : "0x6d2185c4c4f327ac833344442597052ebfc7f2d4a01952f3145b429627fcb2f8",
+                    "nonce" : "0x7c57783a4083e8a5",
                     "number" : "0x01",
-                    "parentHash" : "11621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3",
-                    "receiptTrie" : "0a50a9b49e2f1295fe83a53ebd32cba572413b0219e84c5a1a2a4a0b38f2cdf1",
-                    "stateRoot" : "820a4a233608aa25d7751046aafd716a104389db4a36812c02eb5978debc5227",
+                    "parentHash" : "0x11621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3",
+                    "receiptTrie" : "0x0a50a9b49e2f1295fe83a53ebd32cba572413b0219e84c5a1a2a4a0b38f2cdf1",
+                    "stateRoot" : "0x820a4a233608aa25d7751046aafd716a104389db4a36812c02eb5978debc5227",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a011621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0820a4a233608aa25d7751046aafd716a104389db4a36812c02eb5978debc5227a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00a50a9b49e2f1295fe83a53ebd32cba572413b0219e84c5a1a2a4a0b38f2cdf1b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a00379e7e93d6ba6ea4493d881abdcade8ea4738ffa56aa6147a370e723274bf51881d5f3547feca68cff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a011621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0820a4a233608aa25d7751046aafd716a104389db4a36812c02eb5978debc5227a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00a50a9b49e2f1295fe83a53ebd32cba572413b0219e84c5a1a2a4a0b38f2cdf1b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a06d2185c4c4f327ac833344442597052ebfc7f2d4a01952f3145b429627fcb2f8887c57783a4083e8a5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "11621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x11621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "952c78fad0fdbcb5d406ceb2e903a66c9f794e4da7512335b7dd4eb12bdd4282",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x952c78fad0fdbcb5d406ceb2e903a66c9f794e4da7512335b7dd4eb12bdd4282",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0952c78fad0fdbcb5d406ceb2e903a66c9f794e4da7512335b7dd4eb12bdd4282a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "f913ef5c7e6b3cacf37da421e3f4a192978d8407ed1b2d4b73bb135549376c17",
+        "lastblockhash" : "0x6651a0ae64e98ec3a5cef67f7697a340e9a81792d3fc86541346159fba877f03",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555f7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa09",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcodecallcodecall_110_OOGMAfter_2_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "03c0c37af1cd7946f2709753e05476fd9e899ff3fac86826ad8224f68d40bfd8",
-                    "mixHash" : "7f08c1ce9d320ca8e96ef14555ebe88422552d98089d4498ecd668b28f19d497",
-                    "nonce" : "d00607bf7e4c2f1e",
+                    "hash" : "0x4cd182d608c4390194f9a5210e97deb01999a243fe3c06c6d81ccc1220a88fe5",
+                    "mixHash" : "0xaf3d4380669c529bc62628085060be078d6ad8dae164bdb2e9c38c79783491d2",
+                    "nonce" : "0x3de6fcaf008066ef",
                     "number" : "0x01",
-                    "parentHash" : "11621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3",
-                    "receiptTrie" : "f48f3a07ce86db2260e5038d3beabc54a346961ffe653186cb4f3e79de9effc3",
-                    "stateRoot" : "86c0dccc82f128c00d9fbffd98203b5ee541fa97663abf60545c47d706e020a6",
+                    "parentHash" : "0x11621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3",
+                    "receiptTrie" : "0xf48f3a07ce86db2260e5038d3beabc54a346961ffe653186cb4f3e79de9effc3",
+                    "stateRoot" : "0x86c0dccc82f128c00d9fbffd98203b5ee541fa97663abf60545c47d706e020a6",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a011621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086c0dccc82f128c00d9fbffd98203b5ee541fa97663abf60545c47d706e020a6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f48f3a07ce86db2260e5038d3beabc54a346961ffe653186cb4f3e79de9effc3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a07f08c1ce9d320ca8e96ef14555ebe88422552d98089d4498ecd668b28f19d49788d00607bf7e4c2f1ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a011621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086c0dccc82f128c00d9fbffd98203b5ee541fa97663abf60545c47d706e020a6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f48f3a07ce86db2260e5038d3beabc54a346961ffe653186cb4f3e79de9effc3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a0af3d4380669c529bc62628085060be078d6ad8dae164bdb2e9c38c79783491d2883de6fcaf008066eff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,102 +340,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "11621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x11621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "952c78fad0fdbcb5d406ceb2e903a66c9f794e4da7512335b7dd4eb12bdd4282",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x952c78fad0fdbcb5d406ceb2e903a66c9f794e4da7512335b7dd4eb12bdd4282",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0952c78fad0fdbcb5d406ceb2e903a66c9f794e4da7512335b7dd4eb12bdd4282a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "03c0c37af1cd7946f2709753e05476fd9e899ff3fac86826ad8224f68d40bfd8",
+        "lastblockhash" : "0x4cd182d608c4390194f9a5210e97deb01999a243fe3c06c6d81ccc1220a88fe5",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f69fe0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7616020",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -428,36 +443,41 @@
         }
     },
     "callcodecallcodecall_110_OOGMAfter_2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150c9",
-                    "hash" : "2f9d523ff6954060e181d5b6aafdae2f654627e523d17e39052fba5f7500d9fe",
-                    "mixHash" : "36bf2e6d110fc5b9ff7604c347ef89e5a4254d166585fb915a06360758741ada",
-                    "nonce" : "a2a1bc54ccf93fb7",
+                    "hash" : "0xc3f2c6164ba161d8913c7e02e6be6aa4d84ae53931d0519f0c7117f0326e187e",
+                    "mixHash" : "0xed277c4e6822f78c31cdc8253bdee2457d39de911ceae83f9ef9d13f456d46a0",
+                    "nonce" : "0x2b4516edef7e349d",
                     "number" : "0x01",
-                    "parentHash" : "11621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3",
-                    "receiptTrie" : "d5913ee69adde1b3cad1793bfaee2cbcd404942addba5d6c8c168d3a6cae8b07",
-                    "stateRoot" : "e6a32b7bf776acbd08e9eb0cfd31c5696cf6731b39613483e972099ce3157738",
+                    "parentHash" : "0x11621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3",
+                    "receiptTrie" : "0xd5913ee69adde1b3cad1793bfaee2cbcd404942addba5d6c8c168d3a6cae8b07",
+                    "stateRoot" : "0xe6a32b7bf776acbd08e9eb0cfd31c5696cf6731b39613483e972099ce3157738",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a011621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e6a32b7bf776acbd08e9eb0cfd31c5696cf6731b39613483e972099ce3157738a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0d5913ee69adde1b3cad1793bfaee2cbcd404942addba5d6c8c168d3a6cae8b07b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c98203e880a036bf2e6d110fc5b9ff7604c347ef89e5a4254d166585fb915a06360758741ada88a2a1bc54ccf93fb7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a011621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e6a32b7bf776acbd08e9eb0cfd31c5696cf6731b39613483e972099ce3157738a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0d5913ee69adde1b3cad1793bfaee2cbcd404942addba5d6c8c168d3a6cae8b07b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c98203e880a0ed277c4e6822f78c31cdc8253bdee2457d39de911ceae83f9ef9d13f456d46a0882b4516edef7e349df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -467,102 +487,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "11621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x11621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "952c78fad0fdbcb5d406ceb2e903a66c9f794e4da7512335b7dd4eb12bdd4282",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x952c78fad0fdbcb5d406ceb2e903a66c9f794e4da7512335b7dd4eb12bdd4282",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0952c78fad0fdbcb5d406ceb2e903a66c9f794e4da7512335b7dd4eb12bdd4282a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "2f9d523ff6954060e181d5b6aafdae2f654627e523d17e39052fba5f7500d9fe",
+        "lastblockhash" : "0xc3f2c6164ba161d8913c7e02e6be6aa4d84ae53931d0519f0c7117f0326e187e",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550c9",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af37",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcodecall_110_OOGMAfter_2_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0155f7",
+                    "hash" : "0xd59a2b2649376cac2544c5e597dd1e756bfed7757d83c62c42a51cde98cbce35",
+                    "mixHash" : "0xf93d49a7185c04c072ea48d6de1fbae769d9c5cfa0f70d7e35e52e4837c1d08a",
+                    "nonce" : "0x8fb28255653f358c",
+                    "number" : "0x01",
+                    "parentHash" : "0x11621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3",
+                    "receiptTrie" : "0x7b32f6865ba11d16b4c8e757d35f80e1ea3ddb33d2b2fc644a01c5a2bbb5ba1f",
+                    "stateRoot" : "0xb07293bd6d5dc175950951f5d53cb5bdb0d4ec4a7d2b331657c859ad56b260d4",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a011621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b07293bd6d5dc175950951f5d53cb5bdb0d4ec4a7d2b331657c859ad56b260d4a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07b32f6865ba11d16b4c8e757d35f80e1ea3ddb33d2b2fc644a01c5a2bbb5ba1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a0f93d49a7185c04c072ea48d6de1fbae769d9c5cfa0f70d7e35e52e4837c1d08a888fb28255653f358cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x11621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x952c78fad0fdbcb5d406ceb2e903a66c9f794e4da7512335b7dd4eb12bdd4282",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0952c78fad0fdbcb5d406ceb2e903a66c9f794e4da7512335b7dd4eb12bdd4282a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd59a2b2649376cac2544c5e597dd1e756bfed7757d83c62c42a51cde98cbce35",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555f7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa09",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaf6f4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3_d0g0v0.json
index 7a2cd5b66..bc64a3b9d 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcodecall_110_OOGMAfter_3_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "068a1c7c3f6304faa86c145cddbb537e54d38434ee20e24b0271d7f90415d823",
-                    "mixHash" : "0fe6fa46626e1f236a640d96714c56205141984732b86256ad8432178e7137f1",
-                    "nonce" : "bebd7906f3a6425a",
+                    "hash" : "0xd6c01cdfef0e918a45723e70ea51c1c59cf6758e602ba600ae9f75d8b51ac90c",
+                    "mixHash" : "0x64c555b289706ff57429bc9083f967e040a55d1b66e755e48a15e848f18bdb1a",
+                    "nonce" : "0xcff88eb4601d4d3d",
                     "number" : "0x01",
-                    "parentHash" : "17a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42",
-                    "receiptTrie" : "6d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6d",
-                    "stateRoot" : "e571c7d40a6be752928e183d2c5e01af5098182cbcd066f4eff4aba0732f48a7",
+                    "parentHash" : "0x17a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42",
+                    "receiptTrie" : "0x6d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6d",
+                    "stateRoot" : "0xe571c7d40a6be752928e183d2c5e01af5098182cbcd066f4eff4aba0732f48a7",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a017a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e571c7d40a6be752928e183d2c5e01af5098182cbcd066f4eff4aba0732f48a7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a00fe6fa46626e1f236a640d96714c56205141984732b86256ad8432178e7137f188bebd7906f3a6425af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a017a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e571c7d40a6be752928e183d2c5e01af5098182cbcd066f4eff4aba0732f48a7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a064c555b289706ff57429bc9083f967e040a55d1b66e755e48a15e848f18bdb1a88cff88eb4601d4d3df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "17a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x17a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "28dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x28dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "068a1c7c3f6304faa86c145cddbb537e54d38434ee20e24b0271d7f90415d823",
+        "lastblockhash" : "0xd6c01cdfef0e918a45723e70ea51c1c59cf6758e602ba600ae9f75d8b51ac90c",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcodecallcodecall_110_OOGMAfter_3_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "5aa6dc1ef2c19975350a6950ea788b46cf81670987800b48f4422d75a5c486f4",
-                    "mixHash" : "c6ca0050738c2ee3f8f33e200d97e15aafc6266153ea9cef6b1a0f2b0d55c888",
-                    "nonce" : "79b844345d6dcd47",
+                    "hash" : "0xbff093c4415e6508ecf6300aea368b95492a2505183f55091903009580a7b515",
+                    "mixHash" : "0xb833c09cf054eb1a61db65db86a9739057ab66999529dbbd5ea0e29b7f484a2e",
+                    "nonce" : "0x4523276f88dc407d",
                     "number" : "0x01",
-                    "parentHash" : "17a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42",
-                    "receiptTrie" : "6d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6d",
-                    "stateRoot" : "e571c7d40a6be752928e183d2c5e01af5098182cbcd066f4eff4aba0732f48a7",
+                    "parentHash" : "0x17a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42",
+                    "receiptTrie" : "0x6d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6d",
+                    "stateRoot" : "0xe571c7d40a6be752928e183d2c5e01af5098182cbcd066f4eff4aba0732f48a7",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a017a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e571c7d40a6be752928e183d2c5e01af5098182cbcd066f4eff4aba0732f48a7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0c6ca0050738c2ee3f8f33e200d97e15aafc6266153ea9cef6b1a0f2b0d55c8888879b844345d6dcd47f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a017a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e571c7d40a6be752928e183d2c5e01af5098182cbcd066f4eff4aba0732f48a7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0b833c09cf054eb1a61db65db86a9739057ab66999529dbbd5ea0e29b7f484a2e884523276f88dc407df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "17a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x17a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "28dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x28dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "5aa6dc1ef2c19975350a6950ea788b46cf81670987800b48f4422d75a5c486f4",
+        "lastblockhash" : "0xbff093c4415e6508ecf6300aea368b95492a2505183f55091903009580a7b515",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcodecallcodecall_110_OOGMAfter_3_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "c116041f5a4b1c0f28a0824ca885e6fc94fcb0b787ef54f60baea4b4590bae36",
-                    "mixHash" : "9ce8e9f8d39dd0d6ebb322577268d32ef4eaf19ed6965315b93129a8aa14095b",
-                    "nonce" : "9da4ca671e9c778a",
+                    "hash" : "0x0b621720a29e71114f184425f01e1d8d9edbe50d521f0f63d4460e38254a054b",
+                    "mixHash" : "0x6769aae8da932c78c725467d6005fd3b37aa6342b00d7e13d492c97143001b95",
+                    "nonce" : "0x2e0ff343de5319ce",
                     "number" : "0x01",
-                    "parentHash" : "17a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42",
-                    "receiptTrie" : "5bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cf",
-                    "stateRoot" : "4f56f4f8e719cca3588659cdaab075ea86a2f718d5495d4bf1bf30611036a31a",
+                    "parentHash" : "0x17a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42",
+                    "receiptTrie" : "0x5bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cf",
+                    "stateRoot" : "0x4f56f4f8e719cca3588659cdaab075ea86a2f718d5495d4bf1bf30611036a31a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a017a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f56f4f8e719cca3588659cdaab075ea86a2f718d5495d4bf1bf30611036a31aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a09ce8e9f8d39dd0d6ebb322577268d32ef4eaf19ed6965315b93129a8aa14095b889da4ca671e9c778af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a017a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f56f4f8e719cca3588659cdaab075ea86a2f718d5495d4bf1bf30611036a31aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a06769aae8da932c78c725467d6005fd3b37aa6342b00d7e13d492c97143001b95882e0ff343de5319cef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,102 +340,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "17a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x17a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "28dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x28dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c116041f5a4b1c0f28a0824ca885e6fc94fcb0b787ef54f60baea4b4590bae36",
+        "lastblockhash" : "0x0b621720a29e71114f184425f01e1d8d9edbe50d521f0f63d4460e38254a054b",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -428,36 +443,41 @@
         }
     },
     "callcodecallcodecall_110_OOGMAfter_3_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "5c4d62ae79c4e268704f35064e8b8a9cf58c6a3d54ecf757c0595d94cf43c841",
-                    "mixHash" : "ca3547cb043ab151144ae613dcc1015c7c6b64909259073327dfc50282e38797",
-                    "nonce" : "2bc8342d1e829e22",
+                    "hash" : "0xb696c40cd351de5f1b92c08777dc7823414ead95bd3ea07b4524b97ac2ca9663",
+                    "mixHash" : "0x211a10b19a1f0eee7b82a601777bf328b05ec87a04a28906572f6815fde14242",
+                    "nonce" : "0x72de6497c3158742",
                     "number" : "0x01",
-                    "parentHash" : "17a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42",
-                    "receiptTrie" : "5bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cf",
-                    "stateRoot" : "4f56f4f8e719cca3588659cdaab075ea86a2f718d5495d4bf1bf30611036a31a",
+                    "parentHash" : "0x17a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42",
+                    "receiptTrie" : "0x5bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cf",
+                    "stateRoot" : "0x4f56f4f8e719cca3588659cdaab075ea86a2f718d5495d4bf1bf30611036a31a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a017a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f56f4f8e719cca3588659cdaab075ea86a2f718d5495d4bf1bf30611036a31aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0ca3547cb043ab151144ae613dcc1015c7c6b64909259073327dfc50282e38797882bc8342d1e829e22f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a017a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f56f4f8e719cca3588659cdaab075ea86a2f718d5495d4bf1bf30611036a31aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0211a10b19a1f0eee7b82a601777bf328b05ec87a04a28906572f6815fde142428872de6497c3158742f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -467,102 +487,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "17a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x17a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "28dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x28dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "5c4d62ae79c4e268704f35064e8b8a9cf58c6a3d54ecf757c0595d94cf43c841",
+        "lastblockhash" : "0xb696c40cd351de5f1b92c08777dc7823414ead95bd3ea07b4524b97ac2ca9663",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcodecall_110_OOGMAfter_3_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0155fd",
+                    "hash" : "0x3cb66692e03ad53288cf28dfd7d3a205418a02ee7e4ccd97eb230aab5c65cd57",
+                    "mixHash" : "0x611c3181d44fe807cc0d6c49b42b0cf9f5c8bd0f7621bba6fd48367eba084b81",
+                    "nonce" : "0x7594936d7e924710",
+                    "number" : "0x01",
+                    "parentHash" : "0x17a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0x399fbc37612547a52edb3d609a876791b4bf4ee5f411fc45c7e8678e50a2effb",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a017a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0399fbc37612547a52edb3d609a876791b4bf4ee5f411fc45c7e8678e50a2effba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0611c3181d44fe807cc0d6c49b42b0cf9f5c8bd0f7621bba6fd48367eba084b81887594936d7e924710f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x17a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x28dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3cb66692e03ad53288cf28dfd7d3a205418a02ee7e4ccd97eb230aab5c65cd57",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555fd",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa03",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f1600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0.json
index 55e2e9f11..3391df6cf 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015353",
-                    "hash" : "65e15a126e57f535414134bf6b1fc3e97b0ae8cab1773da61fc7058d50c1c71c",
-                    "mixHash" : "c5b84d6d11bcf84b6c583823cb750390823ca203f21826e0fbb1c18bbbc82200",
-                    "nonce" : "d7d0c667d785ec79",
+                    "hash" : "0x3cacdc37e1b1afa3928f2787728fdaafc0f3d81008692bdaa1cb9b6d5d09bd75",
+                    "mixHash" : "0x8b4dce98da5d2ba08d16eed354743538d8c0e62038f60ee5067ec626d9e83750",
+                    "nonce" : "0xd32543c564575048",
                     "number" : "0x01",
-                    "parentHash" : "876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6",
-                    "receiptTrie" : "2d34e6c0b0ed7ef6d6dbe1c3a389c31dc9ea2fd1fd4b9a7349993937007ab534",
-                    "stateRoot" : "5ef9def5a0e85c477bc330f94e254dff880bce95d5f0e55eac5cf8d534b8c82c",
+                    "parentHash" : "0x876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6",
+                    "receiptTrie" : "0x2d34e6c0b0ed7ef6d6dbe1c3a389c31dc9ea2fd1fd4b9a7349993937007ab534",
+                    "stateRoot" : "0x5ef9def5a0e85c477bc330f94e254dff880bce95d5f0e55eac5cf8d534b8c82c",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ef9def5a0e85c477bc330f94e254dff880bce95d5f0e55eac5cf8d534b8c82ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02d34e6c0b0ed7ef6d6dbe1c3a389c31dc9ea2fd1fd4b9a7349993937007ab534b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153538203e880a0c5b84d6d11bcf84b6c583823cb750390823ca203f21826e0fbb1c18bbbc8220088d7d0c667d785ec79f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ef9def5a0e85c477bc330f94e254dff880bce95d5f0e55eac5cf8d534b8c82ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02d34e6c0b0ed7ef6d6dbe1c3a389c31dc9ea2fd1fd4b9a7349993937007ab534b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153538203e880a08b4dce98da5d2ba08d16eed354743538d8c0e62038f60ee5067ec626d9e8375088d32543c564575048f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,102 +44,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f01031bc9caf27ec528a569c75eb29d01d474cc49e5a5ebfc189fbb72f31e6c7",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf01031bc9caf27ec528a569c75eb29d01d474cc49e5a5ebfc189fbb72f31e6c7",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f01031bc9caf27ec528a569c75eb29d01d474cc49e5a5ebfc189fbb72f31e6c7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "65e15a126e57f535414134bf6b1fc3e97b0ae8cab1773da61fc7058d50c1c71c",
+        "lastblockhash" : "0x3cacdc37e1b1afa3928f2787728fdaafc0f3d81008692bdaa1cb9b6d5d09bd75",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619ca4f46001555a600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55353",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762acad",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619ca4f46001555a600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -142,36 +147,41 @@
         }
     },
     "callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015353",
-                    "hash" : "37e14b097e6916c29c72dfc5c60cad3caf3605018a6606763be79471d3996738",
-                    "mixHash" : "04ce1e2ea7c4779fa312f8174546a99f1f5da3ed96fb5d7653428df57f324045",
-                    "nonce" : "133c5a7197e320c4",
+                    "hash" : "0x37168806daba747b940a91a99beb2cdc827a114e876040961264e5e359e639b1",
+                    "mixHash" : "0x90487fc56736cc84b3d29cbb6014f3389eeefce00acb611cf1f8a88188a35524",
+                    "nonce" : "0xff057d641dd2ae8a",
                     "number" : "0x01",
-                    "parentHash" : "876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6",
-                    "receiptTrie" : "2d34e6c0b0ed7ef6d6dbe1c3a389c31dc9ea2fd1fd4b9a7349993937007ab534",
-                    "stateRoot" : "5ef9def5a0e85c477bc330f94e254dff880bce95d5f0e55eac5cf8d534b8c82c",
+                    "parentHash" : "0x876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6",
+                    "receiptTrie" : "0x2d34e6c0b0ed7ef6d6dbe1c3a389c31dc9ea2fd1fd4b9a7349993937007ab534",
+                    "stateRoot" : "0x5ef9def5a0e85c477bc330f94e254dff880bce95d5f0e55eac5cf8d534b8c82c",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ef9def5a0e85c477bc330f94e254dff880bce95d5f0e55eac5cf8d534b8c82ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02d34e6c0b0ed7ef6d6dbe1c3a389c31dc9ea2fd1fd4b9a7349993937007ab534b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153538203e880a004ce1e2ea7c4779fa312f8174546a99f1f5da3ed96fb5d7653428df57f32404588133c5a7197e320c4f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ef9def5a0e85c477bc330f94e254dff880bce95d5f0e55eac5cf8d534b8c82ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02d34e6c0b0ed7ef6d6dbe1c3a389c31dc9ea2fd1fd4b9a7349993937007ab534b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153538203e880a090487fc56736cc84b3d29cbb6014f3389eeefce00acb611cf1f8a88188a3552488ff057d641dd2ae8af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -181,102 +191,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f01031bc9caf27ec528a569c75eb29d01d474cc49e5a5ebfc189fbb72f31e6c7",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf01031bc9caf27ec528a569c75eb29d01d474cc49e5a5ebfc189fbb72f31e6c7",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f01031bc9caf27ec528a569c75eb29d01d474cc49e5a5ebfc189fbb72f31e6c7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "37e14b097e6916c29c72dfc5c60cad3caf3605018a6606763be79471d3996738",
+        "lastblockhash" : "0x37168806daba747b940a91a99beb2cdc827a114e876040961264e5e359e639b1",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619ca4f46001555a600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f55353",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762acad",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619ca4f46001555a600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -284,36 +294,41 @@
         }
     },
     "callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "78cbf1f0e7337342189c981ed94b4141d9b5009f6d7b939bf348164cc2ab1878",
-                    "mixHash" : "fb5fd931f896d892801e848f6fc1dd1399813679c8708c616dd82d2ca38e9894",
-                    "nonce" : "578bbedc1d50b9b8",
+                    "hash" : "0xbbcfcea5f9cd2d6c84bc621f0097654dc862aeb41ea5fc3db7580fcfae6dc07e",
+                    "mixHash" : "0x302f3414df8c458ee4267f60665dc8efeaa6174a6a247dbba225d69899158475",
+                    "nonce" : "0x5d7778bee3559b91",
                     "number" : "0x01",
-                    "parentHash" : "876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6",
-                    "receiptTrie" : "f760ac403e2f0b3b2dcb7c2c9bf0c5c699070f320dd0c6e4f9f0344abcbfa8aa",
-                    "stateRoot" : "4092a1c83442e6a929a2510230d2c10092609f6299ade0aad8543d8ddd8d30ba",
+                    "parentHash" : "0x876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6",
+                    "receiptTrie" : "0xf760ac403e2f0b3b2dcb7c2c9bf0c5c699070f320dd0c6e4f9f0344abcbfa8aa",
+                    "stateRoot" : "0x4092a1c83442e6a929a2510230d2c10092609f6299ade0aad8543d8ddd8d30ba",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04092a1c83442e6a929a2510230d2c10092609f6299ade0aad8543d8ddd8d30baa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f760ac403e2f0b3b2dcb7c2c9bf0c5c699070f320dd0c6e4f9f0344abcbfa8aab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a0fb5fd931f896d892801e848f6fc1dd1399813679c8708c616dd82d2ca38e989488578bbedc1d50b9b8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04092a1c83442e6a929a2510230d2c10092609f6299ade0aad8543d8ddd8d30baa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f760ac403e2f0b3b2dcb7c2c9bf0c5c699070f320dd0c6e4f9f0344abcbfa8aab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a0302f3414df8c458ee4267f60665dc8efeaa6174a6a247dbba225d69899158475885d7778bee3559b91f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -323,102 +338,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f01031bc9caf27ec528a569c75eb29d01d474cc49e5a5ebfc189fbb72f31e6c7",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf01031bc9caf27ec528a569c75eb29d01d474cc49e5a5ebfc189fbb72f31e6c7",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f01031bc9caf27ec528a569c75eb29d01d474cc49e5a5ebfc189fbb72f31e6c7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "78cbf1f0e7337342189c981ed94b4141d9b5009f6d7b939bf348164cc2ab1878",
+        "lastblockhash" : "0xbbcfcea5f9cd2d6c84bc621f0097654dc862aeb41ea5fc3db7580fcfae6dc07e",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619ca4f46001555a600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f69fe0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7616020",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619ca4f46001555a600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -426,36 +441,41 @@
         }
     },
     "callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150bf",
-                    "hash" : "694f7554e926073829af0e8a7e1de5d93a3c6895ad34daad6fd97dadb2b7ff82",
-                    "mixHash" : "ca9a46a8881b42c86995352476a45cd5c7b992e01cb89207f7a8162cdd8e2a85",
-                    "nonce" : "17e4bfb6878cad69",
+                    "hash" : "0x1416240848f49ff17ccc8e1e69a6c1d33598d9a8ec426024080a305cbc6b5558",
+                    "mixHash" : "0x48998ad7b61b8585121f247e96ebc6da11f66939e6363cddf547f80e5db05cd1",
+                    "nonce" : "0x48bd44577a5a259e",
                     "number" : "0x01",
-                    "parentHash" : "876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6",
-                    "receiptTrie" : "fa89c3e8f07ff91dd1b12032df09055de00297ccc8d10b67a1b1ea45e12442c3",
-                    "stateRoot" : "c76794cb5b0c7e2a715485dd1886cc2c5965e05cbfd35cfa881b5e2ea149eec5",
+                    "parentHash" : "0x876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6",
+                    "receiptTrie" : "0xfa89c3e8f07ff91dd1b12032df09055de00297ccc8d10b67a1b1ea45e12442c3",
+                    "stateRoot" : "0xc76794cb5b0c7e2a715485dd1886cc2c5965e05cbfd35cfa881b5e2ea149eec5",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c76794cb5b0c7e2a715485dd1886cc2c5965e05cbfd35cfa881b5e2ea149eec5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fa89c3e8f07ff91dd1b12032df09055de00297ccc8d10b67a1b1ea45e12442c3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150bf8203e880a0ca9a46a8881b42c86995352476a45cd5c7b992e01cb89207f7a8162cdd8e2a858817e4bfb6878cad69f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c76794cb5b0c7e2a715485dd1886cc2c5965e05cbfd35cfa881b5e2ea149eec5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fa89c3e8f07ff91dd1b12032df09055de00297ccc8d10b67a1b1ea45e12442c3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150bf8203e880a048998ad7b61b8585121f247e96ebc6da11f66939e6363cddf547f80e5db05cd18848bd44577a5a259ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -465,102 +485,256 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "f01031bc9caf27ec528a569c75eb29d01d474cc49e5a5ebfc189fbb72f31e6c7",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf01031bc9caf27ec528a569c75eb29d01d474cc49e5a5ebfc189fbb72f31e6c7",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f01031bc9caf27ec528a569c75eb29d01d474cc49e5a5ebfc189fbb72f31e6c7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "694f7554e926073829af0e8a7e1de5d93a3c6895ad34daad6fd97dadb2b7ff82",
+        "lastblockhash" : "0x1416240848f49ff17ccc8e1e69a6c1d33598d9a8ec426024080a305cbc6b5558",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619ca4f46001555a600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550bf",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af41",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000002619ca4f46001555a600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x015353",
+                    "hash" : "0xa5077c4690872445cf9e86ab9093922373be79626053a33e12a09e7317178016",
+                    "mixHash" : "0x4b87e1a8dafc9fc4897d3ab47f2c3909c3e1cb6e23772b874d6e280748d6bad3",
+                    "nonce" : "0x691def09e8045411",
+                    "number" : "0x01",
+                    "parentHash" : "0x876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6",
+                    "receiptTrie" : "0x894bd6e47e0d8ea83d5b6425be380261794ae8c4b6338023903ea8b47172ccf1",
+                    "stateRoot" : "0x8c86bb9d11d3fdbd8a51a37e23b435653942eeb77d7b3a5c02d9d7d24452766f",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a0876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08c86bb9d11d3fdbd8a51a37e23b435653942eeb77d7b3a5c02d9d7d24452766fa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0894bd6e47e0d8ea83d5b6425be380261794ae8c4b6338023903ea8b47172ccf1b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153538203e880a04b87e1a8dafc9fc4897d3ab47f2c3909c3e1cb6e23772b874d6e280748d6bad388691def09e8045411f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xf01031bc9caf27ec528a569c75eb29d01d474cc49e5a5ebfc189fbb72f31e6c7",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f01031bc9caf27ec528a569c75eb29d01d474cc49e5a5ebfc189fbb72f31e6c7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa5077c4690872445cf9e86ab9093922373be79626053a33e12a09e7317178016",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000002619ca4f46001555a600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f55353",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762acad",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619ca4f46001555a600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0.json
index 48699f6cd..aa808189c 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01560b",
-                    "hash" : "cea65285e658c08c71265d1adbf9915582484c5c8e070f5173dd54a1d52c4d9f",
-                    "mixHash" : "d3c5cb3a0025bf6cc686d7a2d76ab89c065c9f1d703e2e2ee085aa9f5bb527ec",
-                    "nonce" : "d406038a5b69c102",
+                    "hash" : "0xe537eba2c43275503fedab497e64650fe08303128b62368d9eba6dd76a9ee12a",
+                    "mixHash" : "0xc7b5fea8819d01d6674dac4356dbbfbf4c2a656d7bc61db2a347a4095869afdf",
+                    "nonce" : "0xa23bcbace2c432b7",
                     "number" : "0x01",
-                    "parentHash" : "7521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364",
-                    "receiptTrie" : "5db0c4a2708aba30824d95a97638a0cdc1cc932b033879315f14e1a66d4f5f69",
-                    "stateRoot" : "dd3096fd913fee9e9e32eb6245614fc74ea9ecba135097023185aa53d21f019e",
+                    "parentHash" : "0x7521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364",
+                    "receiptTrie" : "0x5db0c4a2708aba30824d95a97638a0cdc1cc932b033879315f14e1a66d4f5f69",
+                    "stateRoot" : "0xdd3096fd913fee9e9e32eb6245614fc74ea9ecba135097023185aa53d21f019e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd3096fd913fee9e9e32eb6245614fc74ea9ecba135097023185aa53d21f019ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05db0c4a2708aba30824d95a97638a0cdc1cc932b033879315f14e1a66d4f5f69b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301560b8203e880a0d3c5cb3a0025bf6cc686d7a2d76ab89c065c9f1d703e2e2ee085aa9f5bb527ec88d406038a5b69c102f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a07521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd3096fd913fee9e9e32eb6245614fc74ea9ecba135097023185aa53d21f019ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05db0c4a2708aba30824d95a97638a0cdc1cc932b033879315f14e1a66d4f5f69b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301560b8203e880a0c7b5fea8819d01d6674dac4356dbbfbf4c2a656d7bc61db2a347a4095869afdf88a23bcbace2c432b7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "7521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x7521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a620ff51bda7f6ba28747f1155da8e9462da1c6f9d3d0eb33637881639984f0a",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa620ff51bda7f6ba28747f1155da8e9462da1c6f9d3d0eb33637881639984f0a",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a620ff51bda7f6ba28747f1155da8e9462da1c6f9d3d0eb33637881639984f0aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "cea65285e658c08c71265d1adbf9915582484c5c8e070f5173dd54a1d52c4d9f",
+        "lastblockhash" : "0xe537eba2c43275503fedab497e64650fe08303128b62368d9eba6dd76a9ee12a",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619ca4f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5560b",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762a9f5",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619ca4f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01560b",
-                    "hash" : "d7c2b2f7fbc1bda91383bb8c11d4b0f9e464ee14ff525a1afa324e50231eb838",
-                    "mixHash" : "bcc8b2ea036b3c5f6580787ee74f47b83c17ecb8bb0e184c61431c745aca619f",
-                    "nonce" : "ad7a1e8c16775ca4",
+                    "hash" : "0xb9da828d205fee654c9f4082ae09acead023923b85d441325177e9774ef847ee",
+                    "mixHash" : "0x6d361f74a993c2296701751d1c7b4a39dd9e9f806e1e01ba24a8a26f74c3d2a4",
+                    "nonce" : "0x580a9e4e2b5a1706",
                     "number" : "0x01",
-                    "parentHash" : "7521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364",
-                    "receiptTrie" : "5db0c4a2708aba30824d95a97638a0cdc1cc932b033879315f14e1a66d4f5f69",
-                    "stateRoot" : "dd3096fd913fee9e9e32eb6245614fc74ea9ecba135097023185aa53d21f019e",
+                    "parentHash" : "0x7521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364",
+                    "receiptTrie" : "0x5db0c4a2708aba30824d95a97638a0cdc1cc932b033879315f14e1a66d4f5f69",
+                    "stateRoot" : "0xdd3096fd913fee9e9e32eb6245614fc74ea9ecba135097023185aa53d21f019e",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd3096fd913fee9e9e32eb6245614fc74ea9ecba135097023185aa53d21f019ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05db0c4a2708aba30824d95a97638a0cdc1cc932b033879315f14e1a66d4f5f69b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301560b8203e880a0bcc8b2ea036b3c5f6580787ee74f47b83c17ecb8bb0e184c61431c745aca619f88ad7a1e8c16775ca4f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a07521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd3096fd913fee9e9e32eb6245614fc74ea9ecba135097023185aa53d21f019ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05db0c4a2708aba30824d95a97638a0cdc1cc932b033879315f14e1a66d4f5f69b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301560b8203e880a06d361f74a993c2296701751d1c7b4a39dd9e9f806e1e01ba24a8a26f74c3d2a488580a9e4e2b5a1706f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "7521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x7521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a620ff51bda7f6ba28747f1155da8e9462da1c6f9d3d0eb33637881639984f0a",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa620ff51bda7f6ba28747f1155da8e9462da1c6f9d3d0eb33637881639984f0a",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a620ff51bda7f6ba28747f1155da8e9462da1c6f9d3d0eb33637881639984f0aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "d7c2b2f7fbc1bda91383bb8c11d4b0f9e464ee14ff525a1afa324e50231eb838",
+        "lastblockhash" : "0xb9da828d205fee654c9f4082ae09acead023923b85d441325177e9774ef847ee",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619ca4f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f5560b",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762a9f5",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619ca4f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "02b7fb1d501db9cac6ce678d20e6d18914caf0cfdb15d4a02d20e841fb59c462",
-                    "mixHash" : "4b11d02100b295892d5a14e5c78c9cfb04a0fd71c579df1277732710d47ba8e1",
-                    "nonce" : "43661ebf2bcbb925",
+                    "hash" : "0xf46338246fdd5893ca201272f514261fcd2b1ec2159a4749a129c756f46981b6",
+                    "mixHash" : "0x217de37c9ead54713dc9fc7777ef204cb19232bc5e0c20e88ac7b10676d0385e",
+                    "nonce" : "0x57eb4764e914ae5a",
                     "number" : "0x01",
-                    "parentHash" : "7521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364",
-                    "receiptTrie" : "ffebc7dd796b61628611afbc88c2fe5ebf24bf890563437630c3f72ea1eee5ee",
-                    "stateRoot" : "3e403265ce4748cd8e8a74172ca0a1f41b4eab12b7035cc98a16e2b92ca561cb",
+                    "parentHash" : "0x7521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364",
+                    "receiptTrie" : "0xffebc7dd796b61628611afbc88c2fe5ebf24bf890563437630c3f72ea1eee5ee",
+                    "stateRoot" : "0x3e403265ce4748cd8e8a74172ca0a1f41b4eab12b7035cc98a16e2b92ca561cb",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e403265ce4748cd8e8a74172ca0a1f41b4eab12b7035cc98a16e2b92ca561cba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ffebc7dd796b61628611afbc88c2fe5ebf24bf890563437630c3f72ea1eee5eeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a04b11d02100b295892d5a14e5c78c9cfb04a0fd71c579df1277732710d47ba8e18843661ebf2bcbb925f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a07521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e403265ce4748cd8e8a74172ca0a1f41b4eab12b7035cc98a16e2b92ca561cba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ffebc7dd796b61628611afbc88c2fe5ebf24bf890563437630c3f72ea1eee5eeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a0217de37c9ead54713dc9fc7777ef204cb19232bc5e0c20e88ac7b10676d0385e8857eb4764e914ae5af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,102 +340,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "7521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x7521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a620ff51bda7f6ba28747f1155da8e9462da1c6f9d3d0eb33637881639984f0a",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa620ff51bda7f6ba28747f1155da8e9462da1c6f9d3d0eb33637881639984f0a",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a620ff51bda7f6ba28747f1155da8e9462da1c6f9d3d0eb33637881639984f0aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "02b7fb1d501db9cac6ce678d20e6d18914caf0cfdb15d4a02d20e841fb59c462",
+        "lastblockhash" : "0xf46338246fdd5893ca201272f514261fcd2b1ec2159a4749a129c756f46981b6",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619ca4f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f69fe0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7616020",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619ca4f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -428,36 +443,41 @@
         }
     },
     "callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150bf",
-                    "hash" : "50d66039e3071aa3d47870c1a8b04a1238962d0535f7c4c2551fed452cd69431",
-                    "mixHash" : "e18f3c40165f8beab3c7f800ffe5f17fa7d1d09d2f37b9d77a906b567bca4b63",
-                    "nonce" : "d0d930166c222a05",
+                    "hash" : "0x06ceb14eb0f6adb0d610c1402e4d9d88ca24258ebc916e99a3685d4a0e220c5b",
+                    "mixHash" : "0x2adb1b455793c211d631f4a36d9bdcdf4ef34b42a520e9d44d0c5d2ccf065a21",
+                    "nonce" : "0xc9b6e78fadd8e1c3",
                     "number" : "0x01",
-                    "parentHash" : "7521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364",
-                    "receiptTrie" : "8c08c62842dd89433ba3e326a0fc4d8df7ea0eb531f3268a85af0741e8b235ab",
-                    "stateRoot" : "3f99e0dd20d473276c121adfe85bb3120f9ec91130e3bd49532d1e2567d7c800",
+                    "parentHash" : "0x7521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364",
+                    "receiptTrie" : "0x8c08c62842dd89433ba3e326a0fc4d8df7ea0eb531f3268a85af0741e8b235ab",
+                    "stateRoot" : "0x3f99e0dd20d473276c121adfe85bb3120f9ec91130e3bd49532d1e2567d7c800",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03f99e0dd20d473276c121adfe85bb3120f9ec91130e3bd49532d1e2567d7c800a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08c08c62842dd89433ba3e326a0fc4d8df7ea0eb531f3268a85af0741e8b235abb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150bf8203e880a0e18f3c40165f8beab3c7f800ffe5f17fa7d1d09d2f37b9d77a906b567bca4b6388d0d930166c222a05f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a07521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03f99e0dd20d473276c121adfe85bb3120f9ec91130e3bd49532d1e2567d7c800a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08c08c62842dd89433ba3e326a0fc4d8df7ea0eb531f3268a85af0741e8b235abb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150bf8203e880a02adb1b455793c211d631f4a36d9bdcdf4ef34b42a520e9d44d0c5d2ccf065a2188c9b6e78fadd8e1c3f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -467,102 +487,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "7521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x7521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "a620ff51bda7f6ba28747f1155da8e9462da1c6f9d3d0eb33637881639984f0a",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa620ff51bda7f6ba28747f1155da8e9462da1c6f9d3d0eb33637881639984f0a",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a620ff51bda7f6ba28747f1155da8e9462da1c6f9d3d0eb33637881639984f0aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "50d66039e3071aa3d47870c1a8b04a1238962d0535f7c4c2551fed452cd69431",
+        "lastblockhash" : "0x06ceb14eb0f6adb0d610c1402e4d9d88ca24258ebc916e99a3685d4a0e220c5b",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619ca4f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550bf",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af41",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000002619ca4f46001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x01560b",
+                    "hash" : "0x8d0528074be085ca3fc62cac2a5d80f9536dc3f5ffba24ae0c907dd4317657ed",
+                    "mixHash" : "0xfaadfa751d527403246847f370edce07d1d747e05ba9178938e6217b3e39a0b2",
+                    "nonce" : "0x34828e026d383591",
+                    "number" : "0x01",
+                    "parentHash" : "0x7521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364",
+                    "receiptTrie" : "0x1926df3be5c4905a6dff93b7431c5c79da9a1aab9889f3fee59e1296ef7a6bd9",
+                    "stateRoot" : "0x4493d327bcb5216076617c074b6bfa74f64205361d9da1324d1a3ff49e81397b",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a07521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04493d327bcb5216076617c074b6bfa74f64205361d9da1324d1a3ff49e81397ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea01926df3be5c4905a6dff93b7431c5c79da9a1aab9889f3fee59e1296ef7a6bd9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301560b8203e880a0faadfa751d527403246847f370edce07d1d747e05ba9178938e6217b3e39a0b28834828e026d383591f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x7521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xa620ff51bda7f6ba28747f1155da8e9462da1c6f9d3d0eb33637881639984f0a",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a620ff51bda7f6ba28747f1155da8e9462da1c6f9d3d0eb33637881639984f0aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8d0528074be085ca3fc62cac2a5d80f9536dc3f5ffba24ae0c907dd4317657ed",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000002619ca4f46001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f5560b",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762a9f5",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619ca4f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0.json
index 485909f85..9e39081c7 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155f7",
-                    "hash" : "38666a615521604319bfe6c9b41f045d691e9a2799f73fab2a3c31702496b9cb",
-                    "mixHash" : "60c7a35e0fb61d26a3a1256e985a59f782372f9310e501473eda0d33a7814cf6",
-                    "nonce" : "09c7d5e58d577293",
+                    "hash" : "0xbc2a820f3371889cdaec1544a361cc87aa0f4998eb09e61ecc1fa0442e5c3681",
+                    "mixHash" : "0x53eeb36fac8cec246941ff9288613dc48a367e36a2ef2d2bfb0dc5804de39c65",
+                    "nonce" : "0xeacf7f897edbbfa7",
                     "number" : "0x01",
-                    "parentHash" : "24800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20e",
-                    "receiptTrie" : "7fe5447b8ea35a9a30ed2d09717368bfa1308881afe846cdd61e097a81ecc2d4",
-                    "stateRoot" : "9bcf499de200a63162a63c6c25df35fbfe3d30793272e2f7d89010215568d531",
+                    "parentHash" : "0x24800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20e",
+                    "receiptTrie" : "0x7fe5447b8ea35a9a30ed2d09717368bfa1308881afe846cdd61e097a81ecc2d4",
+                    "stateRoot" : "0x9bcf499de200a63162a63c6c25df35fbfe3d30793272e2f7d89010215568d531",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a024800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bcf499de200a63162a63c6c25df35fbfe3d30793272e2f7d89010215568d531a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07fe5447b8ea35a9a30ed2d09717368bfa1308881afe846cdd61e097a81ecc2d4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a060c7a35e0fb61d26a3a1256e985a59f782372f9310e501473eda0d33a7814cf68809c7d5e58d577293f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a024800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bcf499de200a63162a63c6c25df35fbfe3d30793272e2f7d89010215568d531a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07fe5447b8ea35a9a30ed2d09717368bfa1308881afe846cdd61e097a81ecc2d4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a053eeb36fac8cec246941ff9288613dc48a367e36a2ef2d2bfb0dc5804de39c6588eacf7f897edbbfa7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "24800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x24800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8bffe1e4c69981b1e0ccd79b92741290ff51be449f3d9f242fea4ceb2b6c1acc",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8bffe1e4c69981b1e0ccd79b92741290ff51be449f3d9f242fea4ceb2b6c1acc",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08bffe1e4c69981b1e0ccd79b92741290ff51be449f3d9f242fea4ceb2b6c1acca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "38666a615521604319bfe6c9b41f045d691e9a2799f73fab2a3c31702496b9cb",
+        "lastblockhash" : "0xbc2a820f3371889cdaec1544a361cc87aa0f4998eb09e61ecc1fa0442e5c3681",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555f7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa09",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155f7",
-                    "hash" : "7f6fd3829b62c485f71d486b65942d297a636e07211578cf9e44cc5d9a6d59e5",
-                    "mixHash" : "67206df5a4197f059bdb5d83655626ba67de0edb3f1d6ba2909bd6773b1acb17",
-                    "nonce" : "c236ca039d4426f7",
+                    "hash" : "0xa00016118bb5309c892e996714e159b04a7acecf7c540c01d78f50d852cb567e",
+                    "mixHash" : "0xb79774ccd60c7485f505d09fba69f7e68de1390d0d0337d81f1f0d4478cd8259",
+                    "nonce" : "0xb78678a51784eddf",
                     "number" : "0x01",
-                    "parentHash" : "24800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20e",
-                    "receiptTrie" : "7fe5447b8ea35a9a30ed2d09717368bfa1308881afe846cdd61e097a81ecc2d4",
-                    "stateRoot" : "9bcf499de200a63162a63c6c25df35fbfe3d30793272e2f7d89010215568d531",
+                    "parentHash" : "0x24800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20e",
+                    "receiptTrie" : "0x7fe5447b8ea35a9a30ed2d09717368bfa1308881afe846cdd61e097a81ecc2d4",
+                    "stateRoot" : "0x9bcf499de200a63162a63c6c25df35fbfe3d30793272e2f7d89010215568d531",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a024800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bcf499de200a63162a63c6c25df35fbfe3d30793272e2f7d89010215568d531a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07fe5447b8ea35a9a30ed2d09717368bfa1308881afe846cdd61e097a81ecc2d4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a067206df5a4197f059bdb5d83655626ba67de0edb3f1d6ba2909bd6773b1acb1788c236ca039d4426f7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a024800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bcf499de200a63162a63c6c25df35fbfe3d30793272e2f7d89010215568d531a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07fe5447b8ea35a9a30ed2d09717368bfa1308881afe846cdd61e097a81ecc2d4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a0b79774ccd60c7485f505d09fba69f7e68de1390d0d0337d81f1f0d4478cd825988b78678a51784eddff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "24800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x24800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8bffe1e4c69981b1e0ccd79b92741290ff51be449f3d9f242fea4ceb2b6c1acc",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8bffe1e4c69981b1e0ccd79b92741290ff51be449f3d9f242fea4ceb2b6c1acc",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08bffe1e4c69981b1e0ccd79b92741290ff51be449f3d9f242fea4ceb2b6c1acca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "7f6fd3829b62c485f71d486b65942d297a636e07211578cf9e44cc5d9a6d59e5",
+        "lastblockhash" : "0xa00016118bb5309c892e996714e159b04a7acecf7c540c01d78f50d852cb567e",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555f7",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa09",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "981c500796f80df377630bda68ce27076646b2b731ac5bfbf62652950687ad05",
-                    "mixHash" : "04e9d18d88cc13ed6df8fa68bf1e9ad9138cf36aec7927c0db9285c648dc01a8",
-                    "nonce" : "f3e640d2dcdea066",
+                    "hash" : "0x9b52882966bfab3b97cad0e5cae5d171751f8af000473f50a7f1c531e9e17616",
+                    "mixHash" : "0x850e7716e440ba073e4ed7506ceca1eccbf0275ab0237dbb2d6c4a30c72d5cc7",
+                    "nonce" : "0x7f8e26fa0730ba61",
                     "number" : "0x01",
-                    "parentHash" : "24800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20e",
-                    "receiptTrie" : "982b68c6635d0593e6e1a1fb8ab52eccdd389447a37ec68a90ad5973487ff813",
-                    "stateRoot" : "a90cc6907a7b020d8ca6f574da34f3af9fbfd56aa1e06ba13d8f49402095f88a",
+                    "parentHash" : "0x24800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20e",
+                    "receiptTrie" : "0x982b68c6635d0593e6e1a1fb8ab52eccdd389447a37ec68a90ad5973487ff813",
+                    "stateRoot" : "0xa90cc6907a7b020d8ca6f574da34f3af9fbfd56aa1e06ba13d8f49402095f88a",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a024800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a90cc6907a7b020d8ca6f574da34f3af9fbfd56aa1e06ba13d8f49402095f88aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0982b68c6635d0593e6e1a1fb8ab52eccdd389447a37ec68a90ad5973487ff813b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a004e9d18d88cc13ed6df8fa68bf1e9ad9138cf36aec7927c0db9285c648dc01a888f3e640d2dcdea066f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a024800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a90cc6907a7b020d8ca6f574da34f3af9fbfd56aa1e06ba13d8f49402095f88aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0982b68c6635d0593e6e1a1fb8ab52eccdd389447a37ec68a90ad5973487ff813b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a0850e7716e440ba073e4ed7506ceca1eccbf0275ab0237dbb2d6c4a30c72d5cc7887f8e26fa0730ba61f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,102 +340,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "24800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x24800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8bffe1e4c69981b1e0ccd79b92741290ff51be449f3d9f242fea4ceb2b6c1acc",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8bffe1e4c69981b1e0ccd79b92741290ff51be449f3d9f242fea4ceb2b6c1acc",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08bffe1e4c69981b1e0ccd79b92741290ff51be449f3d9f242fea4ceb2b6c1acca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "981c500796f80df377630bda68ce27076646b2b731ac5bfbf62652950687ad05",
+        "lastblockhash" : "0x9b52882966bfab3b97cad0e5cae5d171751f8af000473f50a7f1c531e9e17616",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f69fe0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7616020",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -428,36 +443,41 @@
         }
     },
     "callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150bf",
-                    "hash" : "7ee875a28ba38a01ab360434bb3da4f1ad81bd69f1b7ab87f354813f5597e6ec",
-                    "mixHash" : "bd9ae2f85886ae65602e1bfe3b5f5d9a967ea58cfcf819e0cc538c308ab153d7",
-                    "nonce" : "e5a6a337dceb55ad",
+                    "hash" : "0xb1202f6e8e975018b9dcdec6797cc283283687d01b0229a2e9312fc8fc64c420",
+                    "mixHash" : "0x99a870e9990b9914cb31352cbe72bca7dfd8e5c99dacc3afd6abfaa87184dfdd",
+                    "nonce" : "0x837515f36e71098a",
                     "number" : "0x01",
-                    "parentHash" : "24800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20e",
-                    "receiptTrie" : "fedb18c624cbe9bfd0291e5389cc6a67f414a390fc31c52cddc6ccf2fb7909a2",
-                    "stateRoot" : "bc1b4e1299ecb1f08ce10b0e79726c6d93e8e29390e6e6c491c97e85fd6c8ccb",
+                    "parentHash" : "0x24800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20e",
+                    "receiptTrie" : "0xfedb18c624cbe9bfd0291e5389cc6a67f414a390fc31c52cddc6ccf2fb7909a2",
+                    "stateRoot" : "0xbc1b4e1299ecb1f08ce10b0e79726c6d93e8e29390e6e6c491c97e85fd6c8ccb",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a024800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc1b4e1299ecb1f08ce10b0e79726c6d93e8e29390e6e6c491c97e85fd6c8ccba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fedb18c624cbe9bfd0291e5389cc6a67f414a390fc31c52cddc6ccf2fb7909a2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150bf8203e880a0bd9ae2f85886ae65602e1bfe3b5f5d9a967ea58cfcf819e0cc538c308ab153d788e5a6a337dceb55adf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a024800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc1b4e1299ecb1f08ce10b0e79726c6d93e8e29390e6e6c491c97e85fd6c8ccba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fedb18c624cbe9bfd0291e5389cc6a67f414a390fc31c52cddc6ccf2fb7909a2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150bf8203e880a099a870e9990b9914cb31352cbe72bca7dfd8e5c99dacc3afd6abfaa87184dfdd88837515f36e71098af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -467,102 +487,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "24800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20e",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x24800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "8bffe1e4c69981b1e0ccd79b92741290ff51be449f3d9f242fea4ceb2b6c1acc",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8bffe1e4c69981b1e0ccd79b92741290ff51be449f3d9f242fea4ceb2b6c1acc",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08bffe1e4c69981b1e0ccd79b92741290ff51be449f3d9f242fea4ceb2b6c1acca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "7ee875a28ba38a01ab360434bb3da4f1ad81bd69f1b7ab87f354813f5597e6ec",
+        "lastblockhash" : "0xb1202f6e8e975018b9dcdec6797cc283283687d01b0229a2e9312fc8fc64c420",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550bf",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af41",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0155f7",
+                    "hash" : "0x6d93e0af0e953a4abe35405d712aa17c17a6e8c2772ce3fa68fbfa2092d21cd6",
+                    "mixHash" : "0x656356aff591491756f11e1def4879fd3bb8cbfa026b94ef235c8c1b07ed66ad",
+                    "nonce" : "0x464171276b3318b3",
+                    "number" : "0x01",
+                    "parentHash" : "0x24800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20e",
+                    "receiptTrie" : "0x7b32f6865ba11d16b4c8e757d35f80e1ea3ddb33d2b2fc644a01c5a2bbb5ba1f",
+                    "stateRoot" : "0x259e75c01da7a70d0b5463b7b32039dbea908f2632ced4dab8abdecbdf6d9e7d",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a024800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0259e75c01da7a70d0b5463b7b32039dbea908f2632ced4dab8abdecbdf6d9e7da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07b32f6865ba11d16b4c8e757d35f80e1ea3ddb33d2b2fc644a01c5a2bbb5ba1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a0656356aff591491756f11e1def4879fd3bb8cbfa026b94ef235c8c1b07ed66ad88464171276b3318b3f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x24800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20e",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x8bffe1e4c69981b1e0ccd79b92741290ff51be449f3d9f242fea4ceb2b6c1acc",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08bffe1e4c69981b1e0ccd79b92741290ff51be449f3d9f242fea4ceb2b6c1acca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x6d93e0af0e953a4abe35405d712aa17c17a6e8c2772ce3fa68fbfa2092d21cd6",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555f7",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa09",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x604060006040600073100000000000000000000000000000000000000161eaecf4600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f46001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_d0g0v0.json
index 74714c989..fd2bd95c1 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "callcodecallcodecallcode_111_OOGMAfter_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "05a16e648d33ee09224f0c0977ba578db901dde39d2be22964d85f57010918da",
-                    "mixHash" : "d0fea2b11621b4d5ae955e85074881da29adc44772b28dea116869258c2bcdcd",
-                    "nonce" : "ad59228e356dbdd7",
+                    "hash" : "0xe3baf5521d65ea11db7971e4decd0a59bfbd8e531bd83ffcc21c2033d4828d30",
+                    "mixHash" : "0xd9310d4cae2306c4a057a367b65864d510495fb6fd3e8459f820b1eb45375f39",
+                    "nonce" : "0x5dc5d648fc7092dc",
                     "number" : "0x01",
-                    "parentHash" : "0eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580",
-                    "receiptTrie" : "85a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81",
-                    "stateRoot" : "b947e2b0ce1eba06d5377de67de699d8fa10f9234c85d839746091d67d8f8a18",
+                    "parentHash" : "0x0eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580",
+                    "receiptTrie" : "0x85a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81",
+                    "stateRoot" : "0xb947e2b0ce1eba06d5377de67de699d8fa10f9234c85d839746091d67d8f8a18",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b947e2b0ce1eba06d5377de67de699d8fa10f9234c85d839746091d67d8f8a18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea085a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0d0fea2b11621b4d5ae955e85074881da29adc44772b28dea116869258c2bcdcd88ad59228e356dbdd7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a00eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b947e2b0ce1eba06d5377de67de699d8fa10f9234c85d839746091d67d8f8a18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea085a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0d9310d4cae2306c4a057a367b65864d510495fb6fd3e8459f820b1eb45375f39885dc5d648fc7092dcf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "0eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "05a16e648d33ee09224f0c0977ba578db901dde39d2be22964d85f57010918da",
+        "lastblockhash" : "0xe3baf5521d65ea11db7971e4decd0a59bfbd8e531bd83ffcc21c2033d4828d30",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
@@ -68,74 +73,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -143,36 +148,41 @@
         }
     },
     "callcodecallcodecallcode_111_OOGMAfter_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "7bbf51b0ad85e70eca21f9acd2be4c893dff6af54b1217cc1460d75dcc2b5649",
-                    "mixHash" : "7ce99ff58e1ea66cdaa12c85ad4ecd9319e3886a96a386be4f392affef30bada",
-                    "nonce" : "cc5cd7f3ae5ef13c",
+                    "hash" : "0x1dd5fdec754e8cd18f863fe9e46f2ec0a52126cabe8bc955a39fb8f0cbb7513a",
+                    "mixHash" : "0x237beb411efd5d4a67f47448fff434e4c1315fffb25645df38dbfde18ffbec84",
+                    "nonce" : "0xfaf15fb6d04204b0",
                     "number" : "0x01",
-                    "parentHash" : "0eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580",
-                    "receiptTrie" : "85a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81",
-                    "stateRoot" : "b947e2b0ce1eba06d5377de67de699d8fa10f9234c85d839746091d67d8f8a18",
+                    "parentHash" : "0x0eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580",
+                    "receiptTrie" : "0x85a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81",
+                    "stateRoot" : "0xb947e2b0ce1eba06d5377de67de699d8fa10f9234c85d839746091d67d8f8a18",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b947e2b0ce1eba06d5377de67de699d8fa10f9234c85d839746091d67d8f8a18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea085a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a07ce99ff58e1ea66cdaa12c85ad4ecd9319e3886a96a386be4f392affef30bada88cc5cd7f3ae5ef13cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a00eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b947e2b0ce1eba06d5377de67de699d8fa10f9234c85d839746091d67d8f8a18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea085a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0237beb411efd5d4a67f47448fff434e4c1315fffb25645df38dbfde18ffbec8488faf15fb6d04204b0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -182,28 +192,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "0eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "7bbf51b0ad85e70eca21f9acd2be4c893dff6af54b1217cc1460d75dcc2b5649",
+        "lastblockhash" : "0x1dd5fdec754e8cd18f863fe9e46f2ec0a52126cabe8bc955a39fb8f0cbb7513a",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
@@ -211,74 +221,74 @@
                     "0x00" : "0x01"
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f555fd",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762aa03",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -286,36 +296,41 @@
         }
     },
     "callcodecallcodecallcode_111_OOGMAfter_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "929626589b9b2c4eeec31bc4fd1025ea1b5aef247bb9c803d4524ecedf247fbe",
-                    "mixHash" : "65bdb73e5f11cb213ab186d7c6cb79766990a5aa1fad970bf682b03a720fd1a8",
-                    "nonce" : "5b213fac068a1c99",
+                    "hash" : "0xa1952e3bfb5d9017f615491b142ca030a86b29f44ba9572d3b6e2c7101467568",
+                    "mixHash" : "0x68227270bf8fea03aa86a87064146cbe087258ec9469ca19a84184016b12df11",
+                    "nonce" : "0x535775ffffe6ecc3",
                     "number" : "0x01",
-                    "parentHash" : "0eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580",
-                    "receiptTrie" : "6d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494",
-                    "stateRoot" : "bd38189382c50bb083d4b0dafbec8975ddddb7e3cb3a11792409eb9a49aecfdf",
+                    "parentHash" : "0x0eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580",
+                    "receiptTrie" : "0x6d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494",
+                    "stateRoot" : "0xbd38189382c50bb083d4b0dafbec8975ddddb7e3cb3a11792409eb9a49aecfdf",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd38189382c50bb083d4b0dafbec8975ddddb7e3cb3a11792409eb9a49aecfdfa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a065bdb73e5f11cb213ab186d7c6cb79766990a5aa1fad970bf682b03a720fd1a8885b213fac068a1c99f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a00eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd38189382c50bb083d4b0dafbec8975ddddb7e3cb3a11792409eb9a49aecfdfa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a068227270bf8fea03aa86a87064146cbe087258ec9469ca19a84184016b12df1188535775ffffe6ecc3f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -325,102 +340,102 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "0eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "929626589b9b2c4eeec31bc4fd1025ea1b5aef247bb9c803d4524ecedf247fbe",
+        "lastblockhash" : "0xa1952e3bfb5d9017f615491b142ca030a86b29f44ba9572d3b6e2c7101467568",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -428,36 +443,41 @@
         }
     },
     "callcodecallcodecallcode_111_OOGMAfter_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "c191e033b3035aff68ee3e452f6d24523bc4ab93abc119e80f6d6ff00f154131",
-                    "mixHash" : "7c461dd2471804b508c8be41bdb4fb619b1737e2b28ef99110a97b85c870c773",
-                    "nonce" : "674ea61639825275",
+                    "hash" : "0xf82a69a0d1b917b1c9d6110cf363a6bfd7114ac8d526561779579d95e0403851",
+                    "mixHash" : "0xcc207318a92012236c4e3b3a2729bf414b47714bb8a7607a64f588139e78a482",
+                    "nonce" : "0x0cec2ca1dab16ed5",
                     "number" : "0x01",
-                    "parentHash" : "0eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580",
-                    "receiptTrie" : "6d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494",
-                    "stateRoot" : "bd38189382c50bb083d4b0dafbec8975ddddb7e3cb3a11792409eb9a49aecfdf",
+                    "parentHash" : "0x0eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580",
+                    "receiptTrie" : "0x6d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494",
+                    "stateRoot" : "0xbd38189382c50bb083d4b0dafbec8975ddddb7e3cb3a11792409eb9a49aecfdf",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd38189382c50bb083d4b0dafbec8975ddddb7e3cb3a11792409eb9a49aecfdfa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a07c461dd2471804b508c8be41bdb4fb619b1737e2b28ef99110a97b85c870c77388674ea61639825275f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a00eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd38189382c50bb083d4b0dafbec8975ddddb7e3cb3a11792409eb9a49aecfdfa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0cc207318a92012236c4e3b3a2729bf414b47714bb8a7607a64f588139e78a482880cec2ca1dab16ed5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
                         "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
-                        "to" : "1000000000000000000000000000000000000000",
+                        "to" : "0x1000000000000000000000000000000000000000",
                         "v" : "0x1b",
                         "value" : "0x00"
                     }
@@ -467,102 +487,257 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "0eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0x0eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "6a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "c191e033b3035aff68ee3e452f6d24523bc4ab93abc119e80f6d6ff00f154131",
+        "lastblockhash" : "0xf82a69a0d1b917b1c9d6110cf363a6bfd7114ac8d526561779579d95e0403851",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f550cc",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a762af34",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "callcodecallcodecallcode_111_OOGMAfter_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x0155fd",
+                    "hash" : "0x0ec21e22e0d66aee227b530699639510a1fd18a6843bd17a3c541a30aeb2860c",
+                    "mixHash" : "0x60f9308d33d3a7c9a9eccec154f088db1bb47ca09d6a2ed65aadfd29b8d1a831",
+                    "nonce" : "0x208d0e355ec2fab7",
+                    "number" : "0x01",
+                    "parentHash" : "0x0eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580",
+                    "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
+                    "stateRoot" : "0xc237a72d38f6924efa0f08b7657956ff775f28c771eba6f9a842134029cd0931",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90260f901f8a00eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c237a72d38f6924efa0f08b7657956ff775f28c771eba6f9a842134029cd0931a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a060f9308d33d3a7c9a9eccec154f088db1bb47ca09d6a2ed65aadfd29b8d1a83188208d0e355ec2fab7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0x029fe0",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0xbaf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916b",
+                        "s" : "0x4cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2",
+                        "to" : "0x1000000000000000000000000000000000000000",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0x0eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0x6a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x0ec21e22e0d66aee227b530699639510a1fd18a6843bd17a3c541a30aeb2860c",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000000" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x00" : "0x01"
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000002" : {
+                "balance" : "0x00",
+                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000003" : {
+                "balance" : "0x00",
+                "code" : "0x6001600355",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f555fd",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a762aa03",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000000" : {
+            "0x1000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf6f2600055",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f26001556001600352",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000002" : {
+            "0x1000000000000000000000000000000000000002" : {
                 "balance" : "0x00",
                 "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "1000000000000000000000000000000000000003" : {
+            "0x1000000000000000000000000000000000000003" : {
                 "balance" : "0x00",
                 "code" : "0x6001600355",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0.json
index aaa194bb1..1c9846315 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0.json
@@ -1,26 +1,31 @@
 {
     "contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x012411",
-                    "hash" : "8cb8d398d29fbda14c557efaaa51e3bc767e94c43b7868d9911d605b3c77db98",
-                    "mixHash" : "f7ec6120026a8db59b9c22f56cc482f6e05d9feba375b920d7290fd435ec6779",
-                    "nonce" : "4f6ed339677fb3b5",
+                    "hash" : "0x8b38ca43124606ea7b7415dec4bfbe6f9f93bcfbc7c77d02a7b71e41c14e8eab",
+                    "mixHash" : "0x6d5405acf8f68163974a804cc1d5f8ac84152db97ed4db7a211f7a2514bf45d7",
+                    "nonce" : "0x9b19431ac8dbe825",
                     "number" : "0x01",
-                    "parentHash" : "a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
-                    "receiptTrie" : "688c1b2f7442a5b35a54c7d45fecbe34d217f34b6034a1efcfa58c69ff256823",
-                    "stateRoot" : "feef22de91fe396f0f0d855ae5050d1ca88ef1bcfd4a5e2b004a48311ff5dbdc",
+                    "parentHash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
+                    "receiptTrie" : "0x688c1b2f7442a5b35a54c7d45fecbe34d217f34b6034a1efcfa58c69ff256823",
+                    "stateRoot" : "0xfeef22de91fe396f0f0d855ae5050d1ca88ef1bcfd4a5e2b004a48311ff5dbdc",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xfadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff901f8a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0feef22de91fe396f0f0d855ae5050d1ca88ef1bcfd4a5e2b004a48311ff5dbdca0fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75a0688c1b2f7442a5b35a54c7d45fecbe34d217f34b6034a1efcfa58c69ff256823b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124118203e880a0f7ec6120026a8db59b9c22f56cc482f6e05d9feba375b920d7290fd435ec6779884f6ed339677fb3b5f871f86f8001830177008080a36040600060406000600073100000000000000000000000000000000000000161c350f11ba0853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9ea035ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0c0",
+                "rlp" : "0xf9026ff901f8a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0feef22de91fe396f0f0d855ae5050d1ca88ef1bcfd4a5e2b004a48311ff5dbdca0fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75a0688c1b2f7442a5b35a54c7d45fecbe34d217f34b6034a1efcfa58c69ff256823b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124118203e880a06d5405acf8f68163974a804cc1d5f8ac84152db97ed4db7a211f7a2514bf45d7889b19431ac8dbe825f871f86f8001830177008080a36040600060406000600073100000000000000000000000000000000000000161c350f11ba0853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9ea035ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0c0",
                 "transactions" : [
                     {
                         "data" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
@@ -39,28 +44,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "e83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "8cb8d398d29fbda14c557efaaa51e3bc767e94c43b7868d9911d605b3c77db98",
+        "lastblockhash" : "0x8b38ca43124606ea7b7415dec4bfbe6f9f93bcfbc7c77d02a7b71e41c14e8eab",
         "network" : "EIP150",
         "postState" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6001600155",
                 "nonce" : "0x00",
@@ -68,28 +73,28 @@
                     "0x01" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f52411",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fa4cf",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
                 "nonce" : "0x00",
@@ -98,21 +103,21 @@
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6001600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x10c8e0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
                 "nonce" : "0x00",
@@ -122,27 +127,32 @@
         }
     },
     "contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x012411",
-                    "hash" : "4c0f61a7e0ec8eabcca2381f484446527fda16649d4333ced8a1240bc32dea53",
-                    "mixHash" : "3180db162609d888f2e59c2d872a576073c0a04ce928d7c27d562aac01334188",
-                    "nonce" : "f6d2edece887b9b3",
+                    "hash" : "0x1feb30c0828c0ade481eac641fc2c29569271820040b3a034372fe7ee75acecd",
+                    "mixHash" : "0xeabe62243af7a0415e3e9a5cc45f4e9bfdc00b3c2f7dc2b02d348ce8129e513d",
+                    "nonce" : "0xeaff674a6069d4ee",
                     "number" : "0x01",
-                    "parentHash" : "a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
-                    "receiptTrie" : "fef1a9f2cb211d1cd6f070357f74fb95d27d43cb2d6a70970fac5813de19e020",
-                    "stateRoot" : "60b79c80ea419bdff2ef3936fa533871cd3ba9956d15a6eb49728b43880bdeae",
+                    "parentHash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
+                    "receiptTrie" : "0xfef1a9f2cb211d1cd6f070357f74fb95d27d43cb2d6a70970fac5813de19e020",
+                    "stateRoot" : "0x60b79c80ea419bdff2ef3936fa533871cd3ba9956d15a6eb49728b43880bdeae",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xfadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff901f8a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa060b79c80ea419bdff2ef3936fa533871cd3ba9956d15a6eb49728b43880bdeaea0fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75a0fef1a9f2cb211d1cd6f070357f74fb95d27d43cb2d6a70970fac5813de19e020b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124118203e880a03180db162609d888f2e59c2d872a576073c0a04ce928d7c27d562aac0133418888f6d2edece887b9b3f871f86f8001830177008080a36040600060406000600073100000000000000000000000000000000000000161c350f11ba0853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9ea035ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0c0",
+                "rlp" : "0xf9026ff901f8a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa060b79c80ea419bdff2ef3936fa533871cd3ba9956d15a6eb49728b43880bdeaea0fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75a0fef1a9f2cb211d1cd6f070357f74fb95d27d43cb2d6a70970fac5813de19e020b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124118203e880a0eabe62243af7a0415e3e9a5cc45f4e9bfdc00b3c2f7dc2b02d348ce8129e513d88eaff674a6069d4eef871f86f8001830177008080a36040600060406000600073100000000000000000000000000000000000000161c350f11ba0853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9ea035ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0c0",
                 "transactions" : [
                     {
                         "data" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
@@ -161,28 +171,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "e83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "4c0f61a7e0ec8eabcca2381f484446527fda16649d4333ced8a1240bc32dea53",
+        "lastblockhash" : "0x1feb30c0828c0ade481eac641fc2c29569271820040b3a034372fe7ee75acecd",
         "network" : "EIP158",
         "postState" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6001600155",
                 "nonce" : "0x00",
@@ -190,28 +200,28 @@
                     "0x01" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f52411",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0fa4cf",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
                 "nonce" : "0x00",
@@ -220,21 +230,21 @@
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6001600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x10c8e0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
                 "nonce" : "0x00",
@@ -244,27 +254,32 @@
         }
     },
     "contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xa47d",
-                    "hash" : "2f269d7ba5395ecafdd7be5e1c6ca746533a2f461649d6e50f7946a80ab5d839",
-                    "mixHash" : "0d9f3273a4c3b5138f593f99b4ceb1e970d638e3401d2773f3b60cc37a18486f",
-                    "nonce" : "c8cfb4e928246d5c",
+                    "hash" : "0x958a670157dbad1a73adf7ff6ff23f8deb038bea477e54ed27086f08f159722c",
+                    "mixHash" : "0x123b3fdb1d9d4cb818ed4a4b9a39202ccb84b70435acd8e30879f2590b2e3452",
+                    "nonce" : "0x76078979966a8e41",
                     "number" : "0x01",
-                    "parentHash" : "a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
-                    "receiptTrie" : "d5b6215f765844456d94f50fc853295d3736cccff39682e7591692fc585d9324",
-                    "stateRoot" : "078d057b3dac082521e7bd28330c62d8bbaaaa3dc2b6de12218ffce58efea997",
+                    "parentHash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
+                    "receiptTrie" : "0xd5b6215f765844456d94f50fc853295d3736cccff39682e7591692fc585d9324",
+                    "stateRoot" : "0x078d057b3dac082521e7bd28330c62d8bbaaaa3dc2b6de12218ffce58efea997",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xfadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ef901f7a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0078d057b3dac082521e7bd28330c62d8bbaaaa3dc2b6de12218ffce58efea997a0fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75a0d5b6215f765844456d94f50fc853295d3736cccff39682e7591692fc585d9324b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a47d8203e880a00d9f3273a4c3b5138f593f99b4ceb1e970d638e3401d2773f3b60cc37a18486f88c8cfb4e928246d5cf871f86f8001830177008080a36040600060406000600073100000000000000000000000000000000000000161c350f11ba0853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9ea035ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0c0",
+                "rlp" : "0xf9026ef901f7a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0078d057b3dac082521e7bd28330c62d8bbaaaa3dc2b6de12218ffce58efea997a0fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75a0d5b6215f765844456d94f50fc853295d3736cccff39682e7591692fc585d9324b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a47d8203e880a0123b3fdb1d9d4cb818ed4a4b9a39202ccb84b70435acd8e30879f2590b2e34528876078979966a8e41f871f86f8001830177008080a36040600060406000600073100000000000000000000000000000000000000161c350f11ba0853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9ea035ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0c0",
                 "transactions" : [
                     {
                         "data" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
@@ -283,28 +298,28 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "e83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "2f269d7ba5395ecafdd7be5e1c6ca746533a2f461649d6e50f7946a80ab5d839",
+        "lastblockhash" : "0x958a670157dbad1a73adf7ff6ff23f8deb038bea477e54ed27086f08f159722c",
         "network" : "Frontier",
         "postState" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6001600155",
                 "nonce" : "0x00",
@@ -312,28 +327,28 @@
                     "0x01" : "0x01"
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4a47d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
                 "balance" : "0x00",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x102463",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
                 "nonce" : "0x00",
@@ -342,21 +357,21 @@
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6001600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x10c8e0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
                 "nonce" : "0x00",
@@ -366,27 +381,32 @@
         }
     },
     "contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x017700",
-                    "hash" : "aa010c3ed31a86a5f86fec43ae354b7435d532f93b67bc5880413d5be5771748",
-                    "mixHash" : "eddcc790c4619fb6da0e0feea9fc75bec7923e5c4a5236808a563a204bab3c45",
-                    "nonce" : "b8464c1338c34e38",
+                    "hash" : "0x645f0a278a42dacbd259154c6a3dc460231eb506c03ba948a0716aa37bf3102e",
+                    "mixHash" : "0xe90a4d98e4067595c1d95df286cadeb240653c3bf0ea07def2a2b3c61b600b90",
+                    "nonce" : "0x19547a27a345c107",
                     "number" : "0x01",
-                    "parentHash" : "a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
-                    "receiptTrie" : "e025bec05756981d211bf8cf5e2e85b400b5884537b3b9b9db6bf2dd38d836d5",
-                    "stateRoot" : "d44b5a75027423028435928d18f87c52aa1eb6b58b247e89f4c878476363cf19",
+                    "parentHash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
+                    "receiptTrie" : "0xe025bec05756981d211bf8cf5e2e85b400b5884537b3b9b9db6bf2dd38d836d5",
+                    "stateRoot" : "0xd44b5a75027423028435928d18f87c52aa1eb6b58b247e89f4c878476363cf19",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0xfadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff901f8a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d44b5a75027423028435928d18f87c52aa1eb6b58b247e89f4c878476363cf19a0fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75a0e025bec05756981d211bf8cf5e2e85b400b5884537b3b9b9db6bf2dd38d836d5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830177008203e880a0eddcc790c4619fb6da0e0feea9fc75bec7923e5c4a5236808a563a204bab3c4588b8464c1338c34e38f871f86f8001830177008080a36040600060406000600073100000000000000000000000000000000000000161c350f11ba0853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9ea035ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0c0",
+                "rlp" : "0xf9026ff901f8a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d44b5a75027423028435928d18f87c52aa1eb6b58b247e89f4c878476363cf19a0fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75a0e025bec05756981d211bf8cf5e2e85b400b5884537b3b9b9db6bf2dd38d836d5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830177008203e880a0e90a4d98e4067595c1d95df286cadeb240653c3bf0ea07def2a2b3c61b600b908819547a27a345c107f871f86f8001830177008080a36040600060406000600073100000000000000000000000000000000000000161c350f11ba0853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9ea035ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0c0",
                 "transactions" : [
                     {
                         "data" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
@@ -405,49 +425,183 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "e83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4f",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4f",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "aa010c3ed31a86a5f86fec43ae354b7435d532f93b67bc5880413d5be5771748",
+        "lastblockhash" : "0x645f0a278a42dacbd259154c6a3dc460231eb506c03ba948a0716aa37bf3102e",
         "network" : "Homestead",
         "postState" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6001600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f57700",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0f51e0",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x10c8e0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0x012411",
+                    "hash" : "0x3cf814c34406866a6c34e1446024777b418a95ffc6cd0882669685067ae85e44",
+                    "mixHash" : "0xb907b670eed2e72b15f788d28f50222b31231ab4968d4fce1ae81b3e26c8e53c",
+                    "nonce" : "0xd0df77c7e66ed65b",
+                    "number" : "0x01",
+                    "parentHash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
+                    "receiptTrie" : "0xd3e8dadbfb4135b152b7668c12a668eb9404d351609ba709e236bc4b0289dfc7",
+                    "stateRoot" : "0xc7fc8fa4c74a983b3347d9122a04fae37677c5bf488273176bbe1f152b74de69",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0xfadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9026ff901f8a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c7fc8fa4c74a983b3347d9122a04fae37677c5bf488273176bbe1f152b74de69a0fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75a0d3e8dadbfb4135b152b7668c12a668eb9404d351609ba709e236bc4b0289dfc7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124118203e880a0b907b670eed2e72b15f788d28f50222b31231ab4968d4fce1ae81b3e26c8e53c88d0df77c7e66ed65bf871f86f8001830177008080a36040600060406000600073100000000000000000000000000000000000000161c350f11ba0853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9ea035ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0c0",
+                "transactions" : [
+                    {
+                        "data" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
+                        "gasLimit" : "0x017700",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9e",
+                        "s" : "0x35ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0",
+                        "to" : "",
+                        "v" : "0x1b",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x3cf814c34406866a6c34e1446024777b418a95ffc6cd0882669685067ae85e44",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                    "0x01" : "0x01"
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f52411",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0fa4cf",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
                 "nonce" : "0x00",
@@ -456,21 +610,21 @@
             }
         },
         "pre" : {
-            "1000000000000000000000000000000000000001" : {
+            "0x1000000000000000000000000000000000000001" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6001600155",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x10c8e0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "b94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0186a0",
                 "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
                 "nonce" : "0x00",
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0.json
new file mode 100644
index 000000000..d067707fe
--- /dev/null
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0.json
@@ -0,0 +1,625 @@
+{
+    "contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xea0f",
+                    "hash" : "0xd78e3aaaedee42a34ce63c87627729f8aeb640047f5f29644d2b5b3f1dbc4be7",
+                    "mixHash" : "0xdbe21482ec0a1cad76d10dd6c99081f26640327e114ff1613ee2ca1fbdc03046",
+                    "nonce" : "0x57f52400e92045e0",
+                    "number" : "0x01",
+                    "parentHash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
+                    "receiptTrie" : "0xde51dfd6b07f21b06caaf9efea6cfc8bb0d9bc157807625c7a03c055641e322e",
+                    "stateRoot" : "0x26e8a2af23bfa5f1701436364396c2f8ec441655a6855159342149f05ce58338",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x03fbc93b06abfb125798b953bc7f9172f64b676c173843c35d7fa21b11dcae1e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9026df901f7a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa026e8a2af23bfa5f1701436364396c2f8ec441655a6855159342149f05ce58338a003fbc93b06abfb125798b953bc7f9172f64b676c173843c35d7fa21b11dcae1ea0de51dfd6b07f21b06caaf9efea6cfc8bb0d9bc157807625c7a03c055641e322eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ea0f8203e880a0dbe21482ec0a1cad76d10dd6c99081f26640327e114ff1613ee2ca1fbdc030468857f52400e92045e0f870f86e800182ea608080a36040600060406000600073100000000000000000000000000000000000000161c350f11ca0755ad66294d4c687d3f77294c28a3dfc6d2c0abde0dd48222f51b3f1077587f0a01f2956fdf5004c42b9cb2d2fbac8e509d8c326c2379c8f907b27d840c3a857bbc0",
+                "transactions" : [
+                    {
+                        "data" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
+                        "gasLimit" : "0xea60",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x755ad66294d4c687d3f77294c28a3dfc6d2c0abde0dd48222f51b3f1077587f0",
+                        "s" : "0x1f2956fdf5004c42b9cb2d2fbac8e509d8c326c2379c8f907b27d840c3a857bb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xd78e3aaaedee42a34ce63c87627729f8aeb640047f5f29644d2b5b3f1dbc4be7",
+        "network" : "EIP150",
+        "postState" : {
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ea0f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0fded1",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x10c8e0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xea0f",
+                    "hash" : "0x8fed17284547e817c6e7a31dec987568821162b5e24313f76f0549ed6b7d17b8",
+                    "mixHash" : "0x855a98859ca82c08bf2df91d729f269809d44553bc9389a1f2c42310f32a516b",
+                    "nonce" : "0xbed85ba549b01cc0",
+                    "number" : "0x01",
+                    "parentHash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
+                    "receiptTrie" : "0x2c1cbc3c1da3b113535cd7109dcc9192edcbbd5c700c74aa5aad4bb20d4bd47b",
+                    "stateRoot" : "0xfd512c755f3d28ce69eb2f88ac841c815db491207899ae4fcd32b7a4c15b67e3",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x03fbc93b06abfb125798b953bc7f9172f64b676c173843c35d7fa21b11dcae1e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9026df901f7a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fd512c755f3d28ce69eb2f88ac841c815db491207899ae4fcd32b7a4c15b67e3a003fbc93b06abfb125798b953bc7f9172f64b676c173843c35d7fa21b11dcae1ea02c1cbc3c1da3b113535cd7109dcc9192edcbbd5c700c74aa5aad4bb20d4bd47bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ea0f8203e880a0855a98859ca82c08bf2df91d729f269809d44553bc9389a1f2c42310f32a516b88bed85ba549b01cc0f870f86e800182ea608080a36040600060406000600073100000000000000000000000000000000000000161c350f11ca0755ad66294d4c687d3f77294c28a3dfc6d2c0abde0dd48222f51b3f1077587f0a01f2956fdf5004c42b9cb2d2fbac8e509d8c326c2379c8f907b27d840c3a857bbc0",
+                "transactions" : [
+                    {
+                        "data" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
+                        "gasLimit" : "0xea60",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x755ad66294d4c687d3f77294c28a3dfc6d2c0abde0dd48222f51b3f1077587f0",
+                        "s" : "0x1f2956fdf5004c42b9cb2d2fbac8e509d8c326c2379c8f907b27d840c3a857bb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x8fed17284547e817c6e7a31dec987568821162b5e24313f76f0549ed6b7d17b8",
+        "network" : "EIP158",
+        "postState" : {
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ea0f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0fded1",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x10c8e0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xea60",
+                    "hash" : "0xc41493e854fdce91323db471457154e5b390e54bd738f43cd2ebc5ab6de7df39",
+                    "mixHash" : "0xc33f9ef7256b6e95c8393a3c235a4022b5a3bc5c79489883e9e08380fa97206c",
+                    "nonce" : "0xf7c344463b411c84",
+                    "number" : "0x01",
+                    "parentHash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
+                    "receiptTrie" : "0x1833f216e9c920d4846964121760d44e99cce64fd9d2d038e4834bb247aa1ffa",
+                    "stateRoot" : "0x39e2844a74774a8327789bf168f97af6ac0abd677b6b84d32c609b1d087c72aa",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x03fbc93b06abfb125798b953bc7f9172f64b676c173843c35d7fa21b11dcae1e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9026df901f7a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039e2844a74774a8327789bf168f97af6ac0abd677b6b84d32c609b1d087c72aaa003fbc93b06abfb125798b953bc7f9172f64b676c173843c35d7fa21b11dcae1ea01833f216e9c920d4846964121760d44e99cce64fd9d2d038e4834bb247aa1ffab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ea608203e880a0c33f9ef7256b6e95c8393a3c235a4022b5a3bc5c79489883e9e08380fa97206c88f7c344463b411c84f870f86e800182ea608080a36040600060406000600073100000000000000000000000000000000000000161c350f11ca0755ad66294d4c687d3f77294c28a3dfc6d2c0abde0dd48222f51b3f1077587f0a01f2956fdf5004c42b9cb2d2fbac8e509d8c326c2379c8f907b27d840c3a857bbc0",
+                "transactions" : [
+                    {
+                        "data" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
+                        "gasLimit" : "0xea60",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x755ad66294d4c687d3f77294c28a3dfc6d2c0abde0dd48222f51b3f1077587f0",
+                        "s" : "0x1f2956fdf5004c42b9cb2d2fbac8e509d8c326c2379c8f907b27d840c3a857bb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xc41493e854fdce91323db471457154e5b390e54bd738f43cd2ebc5ab6de7df39",
+        "network" : "Frontier",
+        "postState" : {
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ea60",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0fde80",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x10c8e0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xea60",
+                    "hash" : "0xa4bd205fa8ec5d2b594c522ad85df02a22b636fbbe0c278c7057832d8d116dda",
+                    "mixHash" : "0xebb0edcb088ceea0bbc877e8111e4be5336b9bdcdf6389771b25dfaa35ef4f24",
+                    "nonce" : "0x587cb34124aa0fa2",
+                    "number" : "0x01",
+                    "parentHash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
+                    "receiptTrie" : "0x1833f216e9c920d4846964121760d44e99cce64fd9d2d038e4834bb247aa1ffa",
+                    "stateRoot" : "0x39e2844a74774a8327789bf168f97af6ac0abd677b6b84d32c609b1d087c72aa",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x03fbc93b06abfb125798b953bc7f9172f64b676c173843c35d7fa21b11dcae1e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9026df901f7a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039e2844a74774a8327789bf168f97af6ac0abd677b6b84d32c609b1d087c72aaa003fbc93b06abfb125798b953bc7f9172f64b676c173843c35d7fa21b11dcae1ea01833f216e9c920d4846964121760d44e99cce64fd9d2d038e4834bb247aa1ffab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ea608203e880a0ebb0edcb088ceea0bbc877e8111e4be5336b9bdcdf6389771b25dfaa35ef4f2488587cb34124aa0fa2f870f86e800182ea608080a36040600060406000600073100000000000000000000000000000000000000161c350f11ca0755ad66294d4c687d3f77294c28a3dfc6d2c0abde0dd48222f51b3f1077587f0a01f2956fdf5004c42b9cb2d2fbac8e509d8c326c2379c8f907b27d840c3a857bbc0",
+                "transactions" : [
+                    {
+                        "data" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
+                        "gasLimit" : "0xea60",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x755ad66294d4c687d3f77294c28a3dfc6d2c0abde0dd48222f51b3f1077587f0",
+                        "s" : "0x1f2956fdf5004c42b9cb2d2fbac8e509d8c326c2379c8f907b27d840c3a857bb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xa4bd205fa8ec5d2b594c522ad85df02a22b636fbbe0c278c7057832d8d116dda",
+        "network" : "Homestead",
+        "postState" : {
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ea60",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0fde80",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x10c8e0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xea0f",
+                    "hash" : "0x23fa53113b6a56ef94853218b41a7207286a4757ef9fb8a5824930dfd6383426",
+                    "mixHash" : "0x9b3676e39064f48baf8b085318e2b177dfee69ec59bb0892e2ca197455cddff7",
+                    "nonce" : "0xcb64af3cd5355d21",
+                    "number" : "0x01",
+                    "parentHash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
+                    "receiptTrie" : "0xff7907de9bff421440d9afd6b825e4e3ad261e777c57ce4fbe7e5456d9409152",
+                    "stateRoot" : "0x0256931899d9ba1c2a143b42099ca6d872d3c2859e6160c4d0091c46fae5fa4a",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x03fbc93b06abfb125798b953bc7f9172f64b676c173843c35d7fa21b11dcae1e",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf9026df901f7a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00256931899d9ba1c2a143b42099ca6d872d3c2859e6160c4d0091c46fae5fa4aa003fbc93b06abfb125798b953bc7f9172f64b676c173843c35d7fa21b11dcae1ea0ff7907de9bff421440d9afd6b825e4e3ad261e777c57ce4fbe7e5456d9409152b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ea0f8203e880a09b3676e39064f48baf8b085318e2b177dfee69ec59bb0892e2ca197455cddff788cb64af3cd5355d21f870f86e800182ea608080a36040600060406000600073100000000000000000000000000000000000000161c350f11ca0755ad66294d4c687d3f77294c28a3dfc6d2c0abde0dd48222f51b3f1077587f0a01f2956fdf5004c42b9cb2d2fbac8e509d8c326c2379c8f907b27d840c3a857bbc0",
+                "transactions" : [
+                    {
+                        "data" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
+                        "gasLimit" : "0xea60",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x755ad66294d4c687d3f77294c28a3dfc6d2c0abde0dd48222f51b3f1077587f0",
+                        "s" : "0x1f2956fdf5004c42b9cb2d2fbac8e509d8c326c2379c8f907b27d840c3a857bb",
+                        "to" : "",
+                        "v" : "0x1c",
+                        "value" : "0x00"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xe83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4f",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0x23fa53113b6a56ef94853218b41a7207286a4757ef9fb8a5824930dfd6383426",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4ea0f",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0fded1",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x1000000000000000000000000000000000000001" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6001600155",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x10c8e0",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0186a0",
+                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    }
+}
+\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit_d0g0v0.json
index 4bcd3bcb6..b2fed74c0 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit_d0g0v0.json
@@ -1,35 +1,40 @@
 {
     "createInitFail_OOGduringInit_d0g0v0_EIP150" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/createInitFail_OOGduringInit_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xcf1d",
-                    "hash" : "895d37a9122778886d94966e97b8239af824ef876571ce5c35340deda89887d0",
-                    "mixHash" : "ef1b99b8b63d905ba24bb543c39af2ec7384c98bee5c8065bf02cb8fef31cf82",
-                    "nonce" : "55dfa7bdea8a9d93",
+                    "hash" : "0xa4bba747a280df14df34293cc225229bf28e252f90cf867fbbea0b90bea2db37",
+                    "mixHash" : "0x38810d246249f9d03cf8c6e8623149d359a81ef52fb4e76b045374edbb62c250",
+                    "nonce" : "0x4cf30e46a7373803",
                     "number" : "0x01",
-                    "parentHash" : "c67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452",
-                    "receiptTrie" : "737a5dbc3c18897a7f7e9206228fae99838c01e328d6f2f3a6a62c7ff1788451",
-                    "stateRoot" : "4b4e4993a4524e8ce1b5fa19bd4fe532d9cc4437a9213260d64fa350203b0bf2",
+                    "parentHash" : "0xc67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452",
+                    "receiptTrie" : "0x737a5dbc3c18897a7f7e9206228fae99838c01e328d6f2f3a6a62c7ff1788451",
+                    "stateRoot" : "0x4b4e4993a4524e8ce1b5fa19bd4fe532d9cc4437a9213260d64fa350203b0bf2",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "11309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x11309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f7a0c67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b4e4993a4524e8ce1b5fa19bd4fe532d9cc4437a9213260d64fa350203b0bf2a011309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3a0737a5dbc3c18897a7f7e9206228fae99838c01e328d6f2f3a6a62c7ff1788451b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082cf1d8203e880a0ef1b99b8b63d905ba24bb543c39af2ec7384c98bee5c8065bf02cb8fef31cf828855dfa7bdea8a9d93f864f862800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca058292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7a0022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75c0",
+                "rlp" : "0xf90261f901f7a0c67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b4e4993a4524e8ce1b5fa19bd4fe532d9cc4437a9213260d64fa350203b0bf2a011309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3a0737a5dbc3c18897a7f7e9206228fae99838c01e328d6f2f3a6a62c7ff1788451b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082cf1d8203e880a038810d246249f9d03cf8c6e8623149d359a81ef52fb4e76b045374edbb62c250884cf30e46a7373803f864f862800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca058292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7a0022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0xcf1d",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x58292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7",
                         "s" : "0x022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
                     }
@@ -39,60 +44,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "c67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "895d37a9122778886d94966e97b8239af824ef876571ce5c35340deda89887d0",
+        "lastblockhash" : "0xa4bba747a280df14df34293cc225229bf28e252f90cf867fbbea0b90bea2db37",
         "network" : "EIP150",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x605a600053600160006001f0ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4cf1d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a76330e3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x605a600053600160006001f0ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -100,36 +105,41 @@
         }
     },
     "createInitFail_OOGduringInit_d0g0v0_EIP158" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/createInitFail_OOGduringInit_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xcf1d",
-                    "hash" : "54836a2828ae308165dfc9076dc941898a6a1219f7d1b02a6bb7662e7e8e36a9",
-                    "mixHash" : "f4e3275d69c8b12c480794367d642e3925022f83535eed230e1eb3b47827db60",
-                    "nonce" : "2073406b475bf056",
+                    "hash" : "0x4e658e08015d27eb4007d087c8c132c3bbb2489465128b703bfeddb34612137f",
+                    "mixHash" : "0xb36050355166b5eaf48ac20ee5fce9598ab06c5bbea295e6781c0080b155ebec",
+                    "nonce" : "0x204e3942025c0d9c",
                     "number" : "0x01",
-                    "parentHash" : "c67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452",
-                    "receiptTrie" : "737a5dbc3c18897a7f7e9206228fae99838c01e328d6f2f3a6a62c7ff1788451",
-                    "stateRoot" : "4b4e4993a4524e8ce1b5fa19bd4fe532d9cc4437a9213260d64fa350203b0bf2",
+                    "parentHash" : "0xc67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452",
+                    "receiptTrie" : "0x737a5dbc3c18897a7f7e9206228fae99838c01e328d6f2f3a6a62c7ff1788451",
+                    "stateRoot" : "0x4b4e4993a4524e8ce1b5fa19bd4fe532d9cc4437a9213260d64fa350203b0bf2",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "11309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x11309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f7a0c67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b4e4993a4524e8ce1b5fa19bd4fe532d9cc4437a9213260d64fa350203b0bf2a011309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3a0737a5dbc3c18897a7f7e9206228fae99838c01e328d6f2f3a6a62c7ff1788451b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082cf1d8203e880a0f4e3275d69c8b12c480794367d642e3925022f83535eed230e1eb3b47827db60882073406b475bf056f864f862800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca058292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7a0022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75c0",
+                "rlp" : "0xf90261f901f7a0c67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b4e4993a4524e8ce1b5fa19bd4fe532d9cc4437a9213260d64fa350203b0bf2a011309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3a0737a5dbc3c18897a7f7e9206228fae99838c01e328d6f2f3a6a62c7ff1788451b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082cf1d8203e880a0b36050355166b5eaf48ac20ee5fce9598ab06c5bbea295e6781c0080b155ebec88204e3942025c0d9cf864f862800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca058292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7a0022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0xcf1d",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x58292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7",
                         "s" : "0x022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
                     }
@@ -139,60 +149,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "c67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "54836a2828ae308165dfc9076dc941898a6a1219f7d1b02a6bb7662e7e8e36a9",
+        "lastblockhash" : "0x4e658e08015d27eb4007d087c8c132c3bbb2489465128b703bfeddb34612137f",
         "network" : "EIP158",
         "postState" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x605a600053600160006001f0ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4cf1d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a76330e3",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x605a600053600160006001f0ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -200,36 +210,41 @@
         }
     },
     "createInitFail_OOGduringInit_d0g0v0_Frontier" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/createInitFail_OOGduringInit_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x715d",
-                    "hash" : "75e5fd28dcdface3939aa71a6a0e50bd47c03919ef78a11bc3641b47da221fe5",
-                    "mixHash" : "f8cf76e463b5a79e5890eb8ada16783e7a16b302612ba296d3ffdeb96650bfc6",
-                    "nonce" : "40aaaea3e066c9f3",
+                    "hash" : "0xa0ed0422bc23411502ea10abf00e347b7d19248b06e9d834e474eab6cc3d709d",
+                    "mixHash" : "0x23edbd6810709f505848ee596a25a3e7670f14bd0e43bca5a1cb5a79b29e4387",
+                    "nonce" : "0x7f0fe1c9245a956b",
                     "number" : "0x01",
-                    "parentHash" : "c67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452",
-                    "receiptTrie" : "d0f55599081d2ee531dc1264e609cc7ab8f994a9ad6879997b8a632182c10b6c",
-                    "stateRoot" : "6eba190c9e0e6cf68e7b13933856519a137f92e80511777ececea8898104e6b8",
+                    "parentHash" : "0xc67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452",
+                    "receiptTrie" : "0xd0f55599081d2ee531dc1264e609cc7ab8f994a9ad6879997b8a632182c10b6c",
+                    "stateRoot" : "0x6eba190c9e0e6cf68e7b13933856519a137f92e80511777ececea8898104e6b8",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "11309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x11309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f7a0c67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06eba190c9e0e6cf68e7b13933856519a137f92e80511777ececea8898104e6b8a011309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3a0d0f55599081d2ee531dc1264e609cc7ab8f994a9ad6879997b8a632182c10b6cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082715d8203e880a0f8cf76e463b5a79e5890eb8ada16783e7a16b302612ba296d3ffdeb96650bfc68840aaaea3e066c9f3f864f862800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca058292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7a0022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75c0",
+                "rlp" : "0xf90261f901f7a0c67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06eba190c9e0e6cf68e7b13933856519a137f92e80511777ececea8898104e6b8a011309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3a0d0f55599081d2ee531dc1264e609cc7ab8f994a9ad6879997b8a632182c10b6cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082715d8203e880a023edbd6810709f505848ee596a25a3e7670f14bd0e43bca5a1cb5a79b29e4387887f0fe1c9245a956bf864f862800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca058292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7a0022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0xcf1d",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x58292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7",
                         "s" : "0x022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
                     }
@@ -239,60 +254,60 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "c67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "75e5fd28dcdface3939aa71a6a0e50bd47c03919ef78a11bc3641b47da221fe5",
+        "lastblockhash" : "0xa0ed0422bc23411502ea10abf00e347b7d19248b06e9d834e474eab6cc3d709d",
         "network" : "Frontier",
         "postState" : {
-            "0000000000000000000000000000000000000000" : {
+            "0x0000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4715d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7620803",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x605a600053600160006001f0ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
@@ -300,36 +315,41 @@
         }
     },
     "createInitFail_OOGduringInit_d0g0v0_Homestead" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/createInitFail_OOGduringInit_d0g0v0Filler.json"
+        },
         "blocks" : [
             {
                 "blockHeader" : {
-                    "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
                     "difficulty" : "0x020000",
-                    "extraData" : "0x",
+                    "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x715d",
-                    "hash" : "84b86e91c8f4cbf1f238b92c50c9d90a87bb33a63688c8e5cd0a3f0dc42400b6",
-                    "mixHash" : "95093a4371be5e7228fddc24ee68daec38715ea32d1ec11d38393d18b7aa1694",
-                    "nonce" : "5d223c1d81956f4a",
+                    "hash" : "0x24f241c636304e176c225c0d3f6c36d499ad6811984f85b64cb1f3fb6fd5a507",
+                    "mixHash" : "0x6e5b3835bc06931dd3bc8a22b3d615f05258ca9be982b9bc017b7fadef65ceb1",
+                    "nonce" : "0xa3d57661f67f6f87",
                     "number" : "0x01",
-                    "parentHash" : "c67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452",
-                    "receiptTrie" : "d0f55599081d2ee531dc1264e609cc7ab8f994a9ad6879997b8a632182c10b6c",
-                    "stateRoot" : "6eba190c9e0e6cf68e7b13933856519a137f92e80511777ececea8898104e6b8",
+                    "parentHash" : "0xc67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452",
+                    "receiptTrie" : "0xd0f55599081d2ee531dc1264e609cc7ab8f994a9ad6879997b8a632182c10b6c",
+                    "stateRoot" : "0x6eba190c9e0e6cf68e7b13933856519a137f92e80511777ececea8898104e6b8",
                     "timestamp" : "0x03e8",
-                    "transactionsTrie" : "11309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3",
-                    "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                    "transactionsTrie" : "0x11309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f7a0c67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06eba190c9e0e6cf68e7b13933856519a137f92e80511777ececea8898104e6b8a011309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3a0d0f55599081d2ee531dc1264e609cc7ab8f994a9ad6879997b8a632182c10b6cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082715d8203e880a095093a4371be5e7228fddc24ee68daec38715ea32d1ec11d38393d18b7aa1694885d223c1d81956f4af864f862800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca058292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7a0022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75c0",
+                "rlp" : "0xf90261f901f7a0c67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06eba190c9e0e6cf68e7b13933856519a137f92e80511777ececea8898104e6b8a011309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3a0d0f55599081d2ee531dc1264e609cc7ab8f994a9ad6879997b8a632182c10b6cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082715d8203e880a06e5b3835bc06931dd3bc8a22b3d615f05258ca9be982b9bc017b7fadef65ceb188a3d57661f67f6f87f864f862800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca058292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7a0022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75c0",
                 "transactions" : [
                     {
-                        "data" : "0x",
+                        "data" : "",
                         "gasLimit" : "0xcf1d",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
                         "r" : "0x58292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7",
                         "s" : "0x022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75",
-                        "to" : "095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
                         "v" : "0x1c",
                         "value" : "0x0186a0"
                     }
@@ -339,60 +359,172 @@
             }
         ],
         "genesisBlockHeader" : {
-            "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
             "difficulty" : "0x020000",
             "extraData" : "0x42",
             "gasLimit" : "0x989680",
             "gasUsed" : "0x00",
-            "hash" : "c67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452",
-            "mixHash" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0102030405060708",
+            "hash" : "0xc67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
             "number" : "0x00",
-            "parentHash" : "0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "ba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9",
             "timestamp" : "0x03b6",
-            "transactionsTrie" : "56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "84b86e91c8f4cbf1f238b92c50c9d90a87bb33a63688c8e5cd0a3f0dc42400b6",
+        "lastblockhash" : "0x24f241c636304e176c225c0d3f6c36d499ad6811984f85b64cb1f3fb6fd5a507",
         "network" : "Homestead",
         "postState" : {
-            "0000000000000000000000000000000000000000" : {
+            "0x0000000000000000000000000000000000000000" : {
                 "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
                 "balance" : "0x4563918244f4715d",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7620803",
-                "code" : "0x",
+                "code" : "",
+                "nonce" : "0x01",
+                "storage" : {
+                }
+            }
+        },
+        "pre" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x605a600053600160006001f0ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            }
+        }
+    },
+    "createInitFail_OOGduringInit_d0g0v0_Metropolis" : {
+        "_info" : {
+            "comment" : "",
+            "filledwith" : "cpp-1.3.0+commit.16292201.Linux.g++",
+            "source" : "/src/GenStateTestAsBcTemp/stChangedEIP150/createInitFail_OOGduringInit_d0g0v0Filler.json"
+        },
+        "blocks" : [
+            {
+                "blockHeader" : {
+                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+                    "difficulty" : "0x020000",
+                    "extraData" : "",
+                    "gasLimit" : "0x989680",
+                    "gasUsed" : "0xcf1d",
+                    "hash" : "0xcf16466dcc2e151d8be1c7c0e56bf2b5c4b268efd46074a369e81d11f114829f",
+                    "mixHash" : "0xf5356277e5832f2f46544842aaace7e59270e46b60a756f37800f38e35b04912",
+                    "nonce" : "0x77694637097137a6",
+                    "number" : "0x01",
+                    "parentHash" : "0xc67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452",
+                    "receiptTrie" : "0x00b8495dc39a1867756b3962d9316b90d7e98079aaa353df03c564f919ea4e81",
+                    "stateRoot" : "0xe0444edde5d6223be1693aa250dd4b5d7700d63fdcf5db3afad0b02ee7c476cb",
+                    "timestamp" : "0x03e8",
+                    "transactionsTrie" : "0x11309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3",
+                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+                },
+                "rlp" : "0xf90261f901f7a0c67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e0444edde5d6223be1693aa250dd4b5d7700d63fdcf5db3afad0b02ee7c476cba011309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3a000b8495dc39a1867756b3962d9316b90d7e98079aaa353df03c564f919ea4e81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082cf1d8203e880a0f5356277e5832f2f46544842aaace7e59270e46b60a756f37800f38e35b049128877694637097137a6f864f862800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca058292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7a0022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75c0",
+                "transactions" : [
+                    {
+                        "data" : "",
+                        "gasLimit" : "0xcf1d",
+                        "gasPrice" : "0x01",
+                        "nonce" : "0x00",
+                        "r" : "0x58292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7",
+                        "s" : "0x022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75",
+                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
+                        "v" : "0x1c",
+                        "value" : "0x0186a0"
+                    }
+                ],
+                "uncleHeaders" : [
+                ]
+            }
+        ],
+        "genesisBlockHeader" : {
+            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
+            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
+            "difficulty" : "0x020000",
+            "extraData" : "0x42",
+            "gasLimit" : "0x989680",
+            "gasUsed" : "0x00",
+            "hash" : "0xc67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452",
+            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "nonce" : "0x0102030405060708",
+            "number" : "0x00",
+            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "stateRoot" : "0xba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9",
+            "timestamp" : "0x03b6",
+            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
+            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
+        },
+        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
+        "lastblockhash" : "0xcf16466dcc2e151d8be1c7c0e56bf2b5c4b268efd46074a369e81d11f114829f",
+        "network" : "Metropolis",
+        "postState" : {
+            "0x00000000000000000000000000000000000000f0" : {
+                "balance" : "0x00",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                "balance" : "0x0de0b6b3a7640000",
+                "code" : "0x605a600053600160006001f0ff",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
+                "balance" : "0x4563918244f4cf1d",
+                "code" : "",
+                "nonce" : "0x00",
+                "storage" : {
+                }
+            },
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                "balance" : "0x0de0b6b3a76330e3",
+                "code" : "",
                 "nonce" : "0x01",
                 "storage" : {
                 }
             }
         },
         "pre" : {
-            "095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
                 "balance" : "0x0de0b6b3a7640000",
                 "code" : "0x605a600053600160006001f0ff",
                 "nonce" : "0x00",
                 "storage" : {
                 }
             },
-            "a94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
                 "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x",
+                "code" : "",
                 "nonce" : "0x00",
                 "storage" : {
                 }