refill blockchain stChangedEIP150 tests

62 files changed, 3548 insertions, 9204 deletions

diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow_d0g0v0.json
index f7739b0bf..5ec6b4319 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow_d0g0v0.json
@@ -2,10 +2,10 @@
     "Call1024BalanceTooLow_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "8a9c257a4bbe7e76167f39d38f135152f27e037f2ec6062ee3f6f65e9993ceb3"
+            "sourceHash" : "17e3ec4279aa11c1c4aa994a55dc2ca8c549393ef58fb76c2b217acc4ce30a5f"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x0117bce4",
-                    "hash" : "0xb000b498a89410bdcd83bb00e1c42323a88d46f00e00ba07b6ed74d21c1f0b87",
-                    "mixHash" : "0xa6e510aa3fe0aaaf7273eee9313d80fe6af5ca456b42fbffd0480af1666ff923",
-                    "nonce" : "0x932a6240d46e2959",
+                    "hash" : "0x840d36cf5379bc903bd35f191cc98f10c88233ddadff969ad4796ea34c177d5a",
+                    "mixHash" : "0x03778d7da2b9d1f65495f0616372340d95d004967bb0746dd54f827f4ee5ccf8",
+                    "nonce" : "0xe71a54c75bdcd929",
                     "number" : "0x01",
                     "parentHash" : "0x355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50",
                     "receiptTrie" : "0x3916ef002c14f35e24fbec7580b490cc1be018bf8705486ce2c1f5ed5e11548b",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90269f901fea0355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08035a74d84745fe1d85eab500f8730013fccf9473ead13cf2d98c8a8924a091ea025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a03916ef002c14f35e24fbec7580b490cc1be018bf8705486ce2c1f5ed5e11548bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a0a6e510aa3fe0aaaf7273eee9313d80fe6af5ca456b42fbffd0480af1666ff92388932a6240d46e2959f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf90269f901fea0355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08035a74d84745fe1d85eab500f8730013fccf9473ead13cf2d98c8a8924a091ea025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a03916ef002c14f35e24fbec7580b490cc1be018bf8705486ce2c1f5ed5e11548bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a003778d7da2b9d1f65495f0616372340d95d004967bb0746dd54f827f4ee5ccf888e71a54c75bdcd929f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x10000000d788",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c09a14728cbaf6f1bc7febd3bc016c87166727ecf78fb9ee35d6e15e4b79f44a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb000b498a89410bdcd83bb00e1c42323a88d46f00e00ba07b6ed74d21c1f0b87",
+        "lastblockhash" : "0x840d36cf5379bc903bd35f191cc98f10c88233ddadff969ad4796ea34c177d5a",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -125,10 +125,10 @@
     "Call1024BalanceTooLow_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "8a9c257a4bbe7e76167f39d38f135152f27e037f2ec6062ee3f6f65e9993ceb3"
+            "sourceHash" : "17e3ec4279aa11c1c4aa994a55dc2ca8c549393ef58fb76c2b217acc4ce30a5f"
         },
         "blocks" : [
             {
@@ -139,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x0117bce4",
-                    "hash" : "0xbba4716ab8fa6987de1e476392cfd447f59b7ac85bca30da9a7a9d6e7f429402",
-                    "mixHash" : "0x80dc8afe4f60eb081e9aa75b087c7d4039378543f08359660b012ae331dd14b8",
-                    "nonce" : "0x478d21b324e23e72",
+                    "hash" : "0xf27b55ca92afddb2aba236d0180f4d4529ca9ad9fbe9a55e14055a9a11b28c2f",
+                    "mixHash" : "0x9d98ce9dcab7907264317ede993eded969240659fffe69f3704868507ce8615c",
+                    "nonce" : "0x922258dd7cc8426b",
                     "number" : "0x01",
                     "parentHash" : "0x355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50",
                     "receiptTrie" : "0xe21c435f977dd4904bdc2e5edbb1ba756222f6e4602493e1fed0a906395bf433",
@@ -150,10 +150,10 @@
                     "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90269f901fea0355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ddd821794b0d44365cc798e1415ab64306f9ae5c2c9be157f26de4642f359d0a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a0e21c435f977dd4904bdc2e5edbb1ba756222f6e4602493e1fed0a906395bf433b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a080dc8afe4f60eb081e9aa75b087c7d4039378543f08359660b012ae331dd14b888478d21b324e23e72f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf90269f901fea0355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ddd821794b0d44365cc798e1415ab64306f9ae5c2c9be157f26de4642f359d0a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a0e21c435f977dd4904bdc2e5edbb1ba756222f6e4602493e1fed0a906395bf433b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a09d98ce9dcab7907264317ede993eded969240659fffe69f3704868507ce8615c88922258dd7cc8426bf865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x10000000d788",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -187,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c09a14728cbaf6f1bc7febd3bc016c87166727ecf78fb9ee35d6e15e4b79f44a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbba4716ab8fa6987de1e476392cfd447f59b7ac85bca30da9a7a9d6e7f429402",
+        "lastblockhash" : "0xf27b55ca92afddb2aba236d0180f4d4529ca9ad9fbe9a55e14055a9a11b28c2f",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -245,258 +245,13 @@
             }
         }
     },
-    "Call1024BalanceTooLow_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "8a9c257a4bbe7e76167f39d38f135152f27e037f2ec6062ee3f6f65e9993ceb3"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x0117bce4",
-                    "hash" : "0x49b291b46b30499ac26049790dcca923796ee1db7957341219939088a66a1845",
-                    "mixHash" : "0x49a756a10b1080a5cbf36d3d6f17ebcc75aee4653e6b89e1c4e1a12eb8f8f039",
-                    "nonce" : "0xd4a6e6bc1a3019f5",
-                    "number" : "0x01",
-                    "parentHash" : "0x355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50",
-                    "receiptTrie" : "0xe21c435f977dd4904bdc2e5edbb1ba756222f6e4602493e1fed0a906395bf433",
-                    "stateRoot" : "0x0ddd821794b0d44365cc798e1415ab64306f9ae5c2c9be157f26de4642f359d0",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90269f901fea0355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00ddd821794b0d44365cc798e1415ab64306f9ae5c2c9be157f26de4642f359d0a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a0e21c435f977dd4904bdc2e5edbb1ba756222f6e4602493e1fed0a906395bf433b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a049a756a10b1080a5cbf36d3d6f17ebcc75aee4653e6b89e1c4e1a12eb8f8f03988d4a6e6bc1a3019f5f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
-                "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" : "0x49b291b46b30499ac26049790dcca923796ee1db7957341219939088a66a1845",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "Call1024BalanceTooLow_d0g0v0_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "8a9c257a4bbe7e76167f39d38f135152f27e037f2ec6062ee3f6f65e9993ceb3"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x10000000d787",
-                    "hash" : "0xd3de77ad2a22bb685d49667f1b9dddda5cdfe39326ac39f34a9c76894e15eecb",
-                    "mixHash" : "0x3e6cbdebd562a6a2b85c702690a47d947a32d06212db1e0d750eec9748550540",
-                    "nonce" : "0xf94fd25a46b362a4",
-                    "number" : "0x01",
-                    "parentHash" : "0x355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50",
-                    "receiptTrie" : "0xf3ab4ebf649ce7b5dcc5da0237f018289850a40c106955ac4eca282cdefaf7f2",
-                    "stateRoot" : "0x47b404765b62a3544b61f6af7af55d485db6f5b9e265ded4481e19069887b7ad",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026bf90200a0355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa047b404765b62a3544b61f6af7af55d485db6f5b9e265ded4481e19069887b7ada025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a0f3ab4ebf649ce7b5dcc5da0237f018289850a40c106955ac4eca282cdefaf7f2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7878203e880a03e6cbdebd562a6a2b85c702690a47d947a32d06212db1e0d750eec974855054088f94fd25a46b362a4f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
-                "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" : "0xd3de77ad2a22bb685d49667f1b9dddda5cdfe39326ac39f34a9c76894e15eecb",
-        "network" : "Frontier",
-        "postState" : {
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563a18244f4d787",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffefffffff286e",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x040a",
-                "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "Call1024BalanceTooLow_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "8a9c257a4bbe7e76167f39d38f135152f27e037f2ec6062ee3f6f65e9993ceb3"
+            "sourceHash" : "17e3ec4279aa11c1c4aa994a55dc2ca8c549393ef58fb76c2b217acc4ce30a5f"
         },
         "blocks" : [
             {
@@ -507,9 +262,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x10000000d787",
-                    "hash" : "0x2ab7b4d4cd904740c132b8452599621c90b99f11a3f13a04d204dd2b6b35531d",
-                    "mixHash" : "0xa3c7702a18adf9d37c495680a07d9a78fb8ac6f5214909493a0b1f058b94ba3a",
-                    "nonce" : "0xf4543a510fa07170",
+                    "hash" : "0x04eb97d8f876aec01c9f50892f39dde9bb45131fd9e4369addf7ed0403938530",
+                    "mixHash" : "0x52503195af1317d046ce3a94dd6ef1122add9801c5f3bb87e78c51a56bfd208d",
+                    "nonce" : "0x5cafc48895785a8c",
                     "number" : "0x01",
                     "parentHash" : "0x355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50",
                     "receiptTrie" : "0xf3ab4ebf649ce7b5dcc5da0237f018289850a40c106955ac4eca282cdefaf7f2",
@@ -518,10 +273,10 @@
                     "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf90200a0355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa047b404765b62a3544b61f6af7af55d485db6f5b9e265ded4481e19069887b7ada025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a0f3ab4ebf649ce7b5dcc5da0237f018289850a40c106955ac4eca282cdefaf7f2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7878203e880a0a3c7702a18adf9d37c495680a07d9a78fb8ac6f5214909493a0b1f058b94ba3a88f4543a510fa07170f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf9026bf90200a0355e8d92a6599fb623165e3dbf243cdaad74c9efa920ff9f9fa99d69269cfd50a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa047b404765b62a3544b61f6af7af55d485db6f5b9e265ded4481e19069887b7ada025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a0f3ab4ebf649ce7b5dcc5da0237f018289850a40c106955ac4eca282cdefaf7f2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7878203e880a052503195af1317d046ce3a94dd6ef1122add9801c5f3bb87e78c51a56bfd208d885cafc48895785a8cf865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x10000000d788",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -555,7 +310,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c09a14728cbaf6f1bc7febd3bc016c87166727ecf78fb9ee35d6e15e4b79f44a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2ab7b4d4cd904740c132b8452599621c90b99f11a3f13a04d204dd2b6b35531d",
+        "lastblockhash" : "0x04eb97d8f876aec01c9f50892f39dde9bb45131fd9e4369addf7ed0403938530",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/Call1024PreCalls_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/Call1024PreCalls_d0g0v0.json
index 21a7e4007..15dabc1da 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/Call1024PreCalls_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/Call1024PreCalls_d0g0v0.json
@@ -2,10 +2,10 @@
     "Call1024PreCalls_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/Call1024PreCalls_d0g0v0Filler.json",
-            "sourceHash" : "6a192b7b0a6276c654773944b0a8b027c3a682cec297c8a8223ffdc6bb7314da"
+            "sourceHash" : "4ace9c95385a0985105f55d011bfe9cd9f136ebfe6bdbd0386a9d7d81c412777"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x022d84a6",
-                    "hash" : "0xcf44c4365d23c945247aed246c2bff9144165067d320ac653068675086d3d22b",
-                    "mixHash" : "0x7039a5272a44432387c050288f88214787ee15824228d135ecf7d146da2d6772",
-                    "nonce" : "0x837524c6bed2f3bb",
+                    "hash" : "0xeffa405bbab29b33d0792521fcc46e8ffc37c828fe8edac750a5c3b130791cb5",
+                    "mixHash" : "0xf6cfdf7043e9bb132633bbf35e5ca3217b3098a4867e8f9591843c7182b88bd9",
+                    "nonce" : "0x668e45da6c687cf0",
                     "number" : "0x01",
                     "parentHash" : "0xc5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fc",
                     "receiptTrie" : "0x47e523f247c7f04664ca01c908f7ffb27e27a8e456da67781db73f57db2d9e3a",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf901fea0c5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ce4daeca53516552145b9dee32d7aa400ef62e37239b10a98c7d9dc48e945b63a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa047e523f247c7f04664ca01c908f7ffb27e27a8e456da67781db73f57db2d9e3ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d84a68203e880a07039a5272a44432387c050288f88214787ee15824228d135ecf7d146da2d677288837524c6bed2f3bbf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026bf901fea0c5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ce4daeca53516552145b9dee32d7aa400ef62e37239b10a98c7d9dc48e945b63a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa047e523f247c7f04664ca01c908f7ffb27e27a8e456da67781db73f57db2d9e3ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d84a68203e880a0f6cfdf7043e9bb132633bbf35e5ca3217b3098a4867e8f9591843c7182b88bd988668e45da6c687cf0f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eefba8e6201d499f56046a96cf9d2b8be216f1ea6ccf6b3d53534527856e9015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcf44c4365d23c945247aed246c2bff9144165067d320ac653068675086d3d22b",
+        "lastblockhash" : "0xeffa405bbab29b33d0792521fcc46e8ffc37c828fe8edac750a5c3b130791cb5",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -127,10 +127,10 @@
     "Call1024PreCalls_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/Call1024PreCalls_d0g0v0Filler.json",
-            "sourceHash" : "6a192b7b0a6276c654773944b0a8b027c3a682cec297c8a8223ffdc6bb7314da"
+            "sourceHash" : "4ace9c95385a0985105f55d011bfe9cd9f136ebfe6bdbd0386a9d7d81c412777"
         },
         "blocks" : [
             {
@@ -141,9 +141,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x022d84a6",
-                    "hash" : "0x841b168dbdb977f96a323673e7dc1d9211791c2bf5bfea9df333af75c96a174a",
-                    "mixHash" : "0x12516cc0d805ca14de76d0afc521c84e2b0c9c5997015fed6cfef698a744ad0a",
-                    "nonce" : "0xdde8ea6016a0e7d7",
+                    "hash" : "0xef13fde848ee4ce69b9da794609d8206df2becb8559c6741ea2c3078244c854e",
+                    "mixHash" : "0x47d33d1133bd8b53732cf6d4cc6d64a11321d86c8ef1b05891061021be9d550a",
+                    "nonce" : "0x8c15d32db0fec078",
                     "number" : "0x01",
                     "parentHash" : "0xc5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fc",
                     "receiptTrie" : "0x9135d290612e7e9510fea75885b2d269ba76eab063ad93ab228de0b3859c4299",
@@ -152,10 +152,10 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf901fea0c5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0396e72db9599f9db815254cdea5ecdb1cfffb5012abb84467492a0dcd5e1e158a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa09135d290612e7e9510fea75885b2d269ba76eab063ad93ab228de0b3859c4299b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d84a68203e880a012516cc0d805ca14de76d0afc521c84e2b0c9c5997015fed6cfef698a744ad0a88dde8ea6016a0e7d7f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026bf901fea0c5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0396e72db9599f9db815254cdea5ecdb1cfffb5012abb84467492a0dcd5e1e158a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa09135d290612e7e9510fea75885b2d269ba76eab063ad93ab228de0b3859c4299b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d84a68203e880a047d33d1133bd8b53732cf6d4cc6d64a11321d86c8ef1b05891061021be9d550a888c15d32db0fec078f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -189,7 +189,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eefba8e6201d499f56046a96cf9d2b8be216f1ea6ccf6b3d53534527856e9015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x841b168dbdb977f96a323673e7dc1d9211791c2bf5bfea9df333af75c96a174a",
+        "lastblockhash" : "0xef13fde848ee4ce69b9da794609d8206df2becb8559c6741ea2c3078244c854e",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -249,262 +249,13 @@
             }
         }
     },
-    "Call1024PreCalls_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/Call1024PreCalls_d0g0v0Filler.json",
-            "sourceHash" : "6a192b7b0a6276c654773944b0a8b027c3a682cec297c8a8223ffdc6bb7314da"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x022d84a6",
-                    "hash" : "0x71d62db9d1e3cb6ca99bab5421584da2fcf688cab2c862c24a8b29280f30edfa",
-                    "mixHash" : "0x70726bd003e8ad020043a31f47d2d473f831e130987e384e0f9f5d0814c9c3cf",
-                    "nonce" : "0x26399f619ed28f6b",
-                    "number" : "0x01",
-                    "parentHash" : "0xc5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fc",
-                    "receiptTrie" : "0x9135d290612e7e9510fea75885b2d269ba76eab063ad93ab228de0b3859c4299",
-                    "stateRoot" : "0x396e72db9599f9db815254cdea5ecdb1cfffb5012abb84467492a0dcd5e1e158",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026bf901fea0c5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0396e72db9599f9db815254cdea5ecdb1cfffb5012abb84467492a0dcd5e1e158a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa09135d290612e7e9510fea75885b2d269ba76eab063ad93ab228de0b3859c4299b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d84a68203e880a070726bd003e8ad020043a31f47d2d473f831e130987e384e0f9f5d0814c9c3cf8826399f619ed28f6bf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
-                "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" : "0x71d62db9d1e3cb6ca99bab5421584da2fcf688cab2c862c24a8b29280f30edfa",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x07e8",
-                "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16003556001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "Call1024PreCalls_d0g0v0_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/Call1024PreCalls_d0g0v0Filler.json",
-            "sourceHash" : "6a192b7b0a6276c654773944b0a8b027c3a682cec297c8a8223ffdc6bb7314da"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x100000018545",
-                    "hash" : "0x88d55ef66eff6ac7c2ea42159cee668245611ef478aee7641b2cab7c9ac9acdf",
-                    "mixHash" : "0x1d3cba21572efd9cd30882d70811d3011427c94391885da3b863434d8ba964f1",
-                    "nonce" : "0x3259533e7657b357",
-                    "number" : "0x01",
-                    "parentHash" : "0xc5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fc",
-                    "receiptTrie" : "0xd0a86dd369ddb39fb029cf61234871f34c1d430fb2eb483847e2998c7f8dd208",
-                    "stateRoot" : "0x25c2221b99164b8d7919abaea8390a32e0d6665d32876fd93921c034956aed4e",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026df90200a0c5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025c2221b99164b8d7919abaea8390a32e0d6665d32876fd93921c034956aed4ea05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0d0a86dd369ddb39fb029cf61234871f34c1d430fb2eb483847e2998c7f8dd208b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff861000000185458203e880a01d3cba21572efd9cd30882d70811d3011427c94391885da3b863434d8ba964f1883259533e7657b357f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
-                "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" : "0x88d55ef66eff6ac7c2ea42159cee668245611ef478aee7641b2cab7c9ac9acdf",
-        "network" : "Frontier",
-        "postState" : {
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563a18244f58545",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fffffffffffffffffffffeffffffe7ab0",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b5a",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x07f0",
-                "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16003556001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x07e8",
-                "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16003556001600054016000556000600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "Call1024PreCalls_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/Call1024PreCalls_d0g0v0Filler.json",
-            "sourceHash" : "6a192b7b0a6276c654773944b0a8b027c3a682cec297c8a8223ffdc6bb7314da"
+            "sourceHash" : "4ace9c95385a0985105f55d011bfe9cd9f136ebfe6bdbd0386a9d7d81c412777"
         },
         "blocks" : [
             {
@@ -515,9 +266,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x100000018545",
-                    "hash" : "0xa3240c2412099ad876e3c7319d0c6e05cb4df7a410d0999ed4f5f780eea67b1a",
-                    "mixHash" : "0x3cda460e1a3f8bc9f18e3ad60757fea95bceeb00d619b167682122283bd692d2",
-                    "nonce" : "0x2ba7668589006f37",
+                    "hash" : "0xdba0e321a08560818ebf2a1bbdb28c0bd287cd53b0bff08440d1d949f01fb298",
+                    "mixHash" : "0xd5938a720c904139b29eac932009cf9334a0caa915b3a4bf92eaf5632df96387",
+                    "nonce" : "0x163379ca2eb3f404",
                     "number" : "0x01",
                     "parentHash" : "0xc5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fc",
                     "receiptTrie" : "0xd0a86dd369ddb39fb029cf61234871f34c1d430fb2eb483847e2998c7f8dd208",
@@ -526,10 +277,10 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026df90200a0c5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025c2221b99164b8d7919abaea8390a32e0d6665d32876fd93921c034956aed4ea05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0d0a86dd369ddb39fb029cf61234871f34c1d430fb2eb483847e2998c7f8dd208b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff861000000185458203e880a03cda460e1a3f8bc9f18e3ad60757fea95bceeb00d619b167682122283bd692d2882ba7668589006f37f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026df90200a0c5ae9f69ef6a6affe6cd3fe8dd73b5e7bcf581e39e97059dfcf38fd00914d2fca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025c2221b99164b8d7919abaea8390a32e0d6665d32876fd93921c034956aed4ea05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0d0a86dd369ddb39fb029cf61234871f34c1d430fb2eb483847e2998c7f8dd208b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff861000000185458203e880a0d5938a720c904139b29eac932009cf9334a0caa915b3a4bf92eaf5632df9638788163379ca2eb3f404f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -563,7 +314,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eefba8e6201d499f56046a96cf9d2b8be216f1ea6ccf6b3d53534527856e9015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa3240c2412099ad876e3c7319d0c6e05cb4df7a410d0999ed4f5f780eea67b1a",
+        "lastblockhash" : "0xdba0e321a08560818ebf2a1bbdb28c0bd287cd53b0bff08440d1d949f01fb298",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow_d0g0v0.json
index 2f4c1dca6..85e17e84a 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow_d0g0v0.json
@@ -2,10 +2,10 @@
     "Callcode1024BalanceTooLow_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "e422d47589dfcf68f85ae3d133038e1dfddf4d53c6eead55ed878985b2ff90a8"
+            "sourceHash" : "e5d624176855749793916794292807ad82eaf07b3575a9f25c147f4fde7dd8b6"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x0117bce4",
-                    "hash" : "0x1ad46f0d98276d96bdcb7e30964e86b8d797c198ca209174cc532f2cf3cf4b3d",
-                    "mixHash" : "0x8e48eaabcbfa5c5df39f75b7184515261ca91e1e2da15ef7bf33bc5977ac5b10",
-                    "nonce" : "0x01c89c5ba0ee6db7",
+                    "hash" : "0x9efe332182c1b0c269e51d1db936cf77b431bcbf8b1e77cd80385603807bd150",
+                    "mixHash" : "0x0c342ce02cd6de166dd3928c3961c4f67946bfbfcd0c6af1f26b97c7ac1a20e2",
+                    "nonce" : "0xf2300ee0ef1e9bc1",
                     "number" : "0x01",
                     "parentHash" : "0xb3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bcea",
                     "receiptTrie" : "0x3916ef002c14f35e24fbec7580b490cc1be018bf8705486ce2c1f5ed5e11548b",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf901fea0b3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bceaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d16c4131e8a82085fa4f79b2e3fbde36513970bc7e3cad253aa9198ba2a164e9a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa03916ef002c14f35e24fbec7580b490cc1be018bf8705486ce2c1f5ed5e11548bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a08e48eaabcbfa5c5df39f75b7184515261ca91e1e2da15ef7bf33bc5977ac5b108801c89c5ba0ee6db7f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026bf901fea0b3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bceaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d16c4131e8a82085fa4f79b2e3fbde36513970bc7e3cad253aa9198ba2a164e9a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa03916ef002c14f35e24fbec7580b490cc1be018bf8705486ce2c1f5ed5e11548bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a00c342ce02cd6de166dd3928c3961c4f67946bfbfcd0c6af1f26b97c7ac1a20e288f2300ee0ef1e9bc1f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0482bdc3fee00d6747e03877bbf2c19e5ddf26c72f366e831ca65b6d4ca2187bfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1ad46f0d98276d96bdcb7e30964e86b8d797c198ca209174cc532f2cf3cf4b3d",
+        "lastblockhash" : "0x9efe332182c1b0c269e51d1db936cf77b431bcbf8b1e77cd80385603807bd150",
         "network" : "Byzantium",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -125,10 +125,10 @@
     "Callcode1024BalanceTooLow_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "e422d47589dfcf68f85ae3d133038e1dfddf4d53c6eead55ed878985b2ff90a8"
+            "sourceHash" : "e5d624176855749793916794292807ad82eaf07b3575a9f25c147f4fde7dd8b6"
         },
         "blocks" : [
             {
@@ -139,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x0117bce4",
-                    "hash" : "0x30811492d785001ca4287cd98ca10aaa664a567ebbabc72a3e9b50c9fd4928a4",
-                    "mixHash" : "0x5ebfd958f973fd6e10c5c16f46d8c5d14c44a786c515e7e36557df1b66b474e9",
-                    "nonce" : "0xfdd10ce7594e897f",
+                    "hash" : "0x31e69d33533c13b15fbd68f3f751289786d40540aac429aa76bcde8212e3c9fe",
+                    "mixHash" : "0x451c447802b3cd593cda8ec4c4632f0c10a44f0eaf9b0aeb7d0618ae876ea67f",
+                    "nonce" : "0xcce8d0e4f7f261a5",
                     "number" : "0x01",
                     "parentHash" : "0xb3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bcea",
                     "receiptTrie" : "0x49790fd18e7694030618faf1b6c312b91fd1428e180a2265746b8b21df8ce345",
@@ -150,10 +150,10 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf901fea0b3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bceaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082e7c5b4c2adf0b0d9de967171e7381025dca7b83ae55768b9d66d8d6bf74114a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa049790fd18e7694030618faf1b6c312b91fd1428e180a2265746b8b21df8ce345b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a05ebfd958f973fd6e10c5c16f46d8c5d14c44a786c515e7e36557df1b66b474e988fdd10ce7594e897ff867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026bf901fea0b3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bceaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082e7c5b4c2adf0b0d9de967171e7381025dca7b83ae55768b9d66d8d6bf74114a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa049790fd18e7694030618faf1b6c312b91fd1428e180a2265746b8b21df8ce345b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a0451c447802b3cd593cda8ec4c4632f0c10a44f0eaf9b0aeb7d0618ae876ea67f88cce8d0e4f7f261a5f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -187,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0482bdc3fee00d6747e03877bbf2c19e5ddf26c72f366e831ca65b6d4ca2187bfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x30811492d785001ca4287cd98ca10aaa664a567ebbabc72a3e9b50c9fd4928a4",
+        "lastblockhash" : "0x31e69d33533c13b15fbd68f3f751289786d40540aac429aa76bcde8212e3c9fe",
         "network" : "EIP150",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
@@ -245,258 +245,13 @@
             }
         }
     },
-    "Callcode1024BalanceTooLow_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "e422d47589dfcf68f85ae3d133038e1dfddf4d53c6eead55ed878985b2ff90a8"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x0117bce4",
-                    "hash" : "0x2839f0e175092939ae1489a74d03a9959ff919483c437b4dddd862f99f9c08d4",
-                    "mixHash" : "0xe177c8a2ad5528cd72975fa6acd1815aeee943f4be50cca9a155582ce694222c",
-                    "nonce" : "0x90ac97e0a7845d80",
-                    "number" : "0x01",
-                    "parentHash" : "0xb3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bcea",
-                    "receiptTrie" : "0x49790fd18e7694030618faf1b6c312b91fd1428e180a2265746b8b21df8ce345",
-                    "stateRoot" : "0x82e7c5b4c2adf0b0d9de967171e7381025dca7b83ae55768b9d66d8d6bf74114",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026bf901fea0b3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bceaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082e7c5b4c2adf0b0d9de967171e7381025dca7b83ae55768b9d66d8d6bf74114a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa049790fd18e7694030618faf1b6c312b91fd1428e180a2265746b8b21df8ce345b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff840117bce48203e880a0e177c8a2ad5528cd72975fa6acd1815aeee943f4be50cca9a155582ce694222c8890ac97e0a7845d80f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
-                "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" : "0x2839f0e175092939ae1489a74d03a9959ff919483c437b4dddd862f99f9c08d4",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "Callcode1024BalanceTooLow_d0g0v0_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "e422d47589dfcf68f85ae3d133038e1dfddf4d53c6eead55ed878985b2ff90a8"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x10000000d787",
-                    "hash" : "0x12bc47000557a9aa4792295c2c48b17bd5dd22b0670e42693b6f1b774523292b",
-                    "mixHash" : "0x0731dc4383ec3226f42ef987949ebc5945f15b9ef71482cc6ae70733baa73fb5",
-                    "nonce" : "0xcdf2c86425016356",
-                    "number" : "0x01",
-                    "parentHash" : "0xb3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bcea",
-                    "receiptTrie" : "0x15122440f1756027edc1ae4a387ca9947cdaf5539eb2f05f5887215479a932e2",
-                    "stateRoot" : "0xacbbd40f8e0d6dee7ca8963df1133468cb31bd43e6cc10345a73891da97aef02",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026df90200a0b3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bceaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0acbbd40f8e0d6dee7ca8963df1133468cb31bd43e6cc10345a73891da97aef02a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa015122440f1756027edc1ae4a387ca9947cdaf5539eb2f05f5887215479a932e2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7878203e880a00731dc4383ec3226f42ef987949ebc5945f15b9ef71482cc6ae70733baa73fb588cdf2c86425016356f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
-                "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" : "0x12bc47000557a9aa4792295c2c48b17bd5dd22b0670e42693b6f1b774523292b",
-        "network" : "Frontier",
-        "postState" : {
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563a18244f4d787",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffefffffff286e",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x040a",
-                "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600060005473bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "Callcode1024BalanceTooLow_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "e422d47589dfcf68f85ae3d133038e1dfddf4d53c6eead55ed878985b2ff90a8"
+            "sourceHash" : "e5d624176855749793916794292807ad82eaf07b3575a9f25c147f4fde7dd8b6"
         },
         "blocks" : [
             {
@@ -507,9 +262,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x10000000d787",
-                    "hash" : "0xe70518a0f9e0319624ddf203b2179b6b61970b60c3b9bfc17e51ed6860ce1d9a",
-                    "mixHash" : "0x43146d2569c24e81029e090043d61aab8d9e40a455b9a41722d6c331d33a7a22",
-                    "nonce" : "0xb1b01cd1fae59e09",
+                    "hash" : "0x2fbeef39e887fcfc82bff6da0eb3ab21be809ddbb6b24b3d0b6add6671c828a8",
+                    "mixHash" : "0xd65342786a76913c4522df989fc5b678e232ffdaa696e01b547d48c5f41b8298",
+                    "nonce" : "0x27abdd95de56d396",
                     "number" : "0x01",
                     "parentHash" : "0xb3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bcea",
                     "receiptTrie" : "0x15122440f1756027edc1ae4a387ca9947cdaf5539eb2f05f5887215479a932e2",
@@ -518,10 +273,10 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026df90200a0b3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bceaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0acbbd40f8e0d6dee7ca8963df1133468cb31bd43e6cc10345a73891da97aef02a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa015122440f1756027edc1ae4a387ca9947cdaf5539eb2f05f5887215479a932e2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7878203e880a043146d2569c24e81029e090043d61aab8d9e40a455b9a41722d6c331d33a7a2288b1b01cd1fae59e09f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026df90200a0b3e7c21e3a0f8cb189e9ee35ca3666dbc629f1266dff806fa1913ceb6f35bceaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0acbbd40f8e0d6dee7ca8963df1133468cb31bd43e6cc10345a73891da97aef02a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa015122440f1756027edc1ae4a387ca9947cdaf5539eb2f05f5887215479a932e2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7878203e880a0d65342786a76913c4522df989fc5b678e232ffdaa696e01b547d48c5f41b82988827abdd95de56d396f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -555,7 +310,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0482bdc3fee00d6747e03877bbf2c19e5ddf26c72f366e831ca65b6d4ca2187bfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe70518a0f9e0319624ddf203b2179b6b61970b60c3b9bfc17e51ed6860ce1d9a",
+        "lastblockhash" : "0x2fbeef39e887fcfc82bff6da0eb3ab21be809ddbb6b24b3d0b6add6671c828a8",
         "network" : "Homestead",
         "postState" : {
             "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1_d0g0v0.json
index 4c81410da..947b0cb7d 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcall_00_OOGE_1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1_d0g0v0Filler.json",
-            "sourceHash" : "548df84c0e9ac2ba75642b30a52e5c892eb2d311d1019cced2d4b5b7e79d3377"
+            "sourceHash" : "acf7a8711a539c07cb82df3263c48e33671d42d0992ec98b89b3f2538d179b9d"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x01c49f",
-                    "hash" : "0xc7a05e201cfc86780aa4a474af283208a4897c9088beaac1297c6e83bf5608ce",
-                    "mixHash" : "0x2e3bfb4ae412bcba8395469cb0e033e431a50a6721ec7386e3e725604b8d8398",
-                    "nonce" : "0xc73a884b4fcf4a88",
+                    "hash" : "0xe5b2c28e0bf73f001ed27f7899bf2b762e650b29056e587d034d787a6cfdbfde",
+                    "mixHash" : "0x0c9d0c944d2ac1cbfe1db3347cbfd3c7a65403f5e5f92555fec8b0d5a05772e1",
+                    "nonce" : "0x8a2846e946bf011e",
                     "number" : "0x01",
                     "parentHash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
                     "receiptTrie" : "0xaf0bacc9c88f7f366e10dc24b62a5e4188212ac033c9dfba47c66dd08aad3dcc",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x31ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0486f5bd5a1340f11066eb76821de4dd7900f62d08779ba00d4da29c0528e6704a031ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0a0af0bacc9c88f7f366e10dc24b62a5e4188212ac033c9dfba47c66dd08aad3dccb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301c49f8203e880a02e3bfb4ae412bcba8395469cb0e033e431a50a6721ec7386e3e725604b8d839888c73a884b4fcf4a88f862f86080018302bf6294100000000000000000000000000000000000000080801ba0f2904491d7d84ada0d1d94ee35aac71a0cb52ea2f8c16545f7493c14737ba15ca002f2ee18f95a17f1ba5ed106d78ae430d1fc3c5f88eb86cfbce90c9bc09b20c4c0",
+                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0486f5bd5a1340f11066eb76821de4dd7900f62d08779ba00d4da29c0528e6704a031ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0a0af0bacc9c88f7f366e10dc24b62a5e4188212ac033c9dfba47c66dd08aad3dccb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301c49f8203e880a00c9d0c944d2ac1cbfe1db3347cbfd3c7a65403f5e5f92555fec8b0d5a05772e1888a2846e946bf011ef862f86080018302bf6294100000000000000000000000000000000000000080801ba0f2904491d7d84ada0d1d94ee35aac71a0cb52ea2f8c16545f7493c14737ba15ca002f2ee18f95a17f1ba5ed106d78ae430d1fc3c5f88eb86cfbce90c9bc09b20c4c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x02bf62",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc7a05e201cfc86780aa4a474af283208a4897c9088beaac1297c6e83bf5608ce",
+        "lastblockhash" : "0xe5b2c28e0bf73f001ed27f7899bf2b762e650b29056e587d034d787a6cfdbfde",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -141,10 +141,10 @@
     "callcall_00_OOGE_1_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1_d0g0v0Filler.json",
-            "sourceHash" : "548df84c0e9ac2ba75642b30a52e5c892eb2d311d1019cced2d4b5b7e79d3377"
+            "sourceHash" : "acf7a8711a539c07cb82df3263c48e33671d42d0992ec98b89b3f2538d179b9d"
         },
         "blocks" : [
             {
@@ -155,9 +155,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x01c49f",
-                    "hash" : "0x5557ca209a96c8c0b35c54d51f1abea3373cb66833178b7746f42869eba320ea",
-                    "mixHash" : "0xabe08a39c8c92672d0a0629b3f81937a8432e8a19ed380dd808df52eddff3b8a",
-                    "nonce" : "0x13a93258a418beb0",
+                    "hash" : "0x5e727e230a9b2136d4d50c3169eb0569636ca63195535becbf25449eaf51bdd6",
+                    "mixHash" : "0x0f3152ccab497a4aa1b33df213bb3eb05042e0afa28f8dc4b5765548708fa873",
+                    "nonce" : "0xc0dc02f723b60908",
                     "number" : "0x01",
                     "parentHash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
                     "receiptTrie" : "0xe6aff110a7903b6979be95fb1a2bf7b209d4bf82f3b8ef9e87d7487f449e5f02",
@@ -166,10 +166,10 @@
                     "transactionsTrie" : "0x31ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a2c583fb9edd66fc38f8bbef9ad68ab7aec0abd25906b550361dc296fd71162a031ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0a0e6aff110a7903b6979be95fb1a2bf7b209d4bf82f3b8ef9e87d7487f449e5f02b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301c49f8203e880a0abe08a39c8c92672d0a0629b3f81937a8432e8a19ed380dd808df52eddff3b8a8813a93258a418beb0f862f86080018302bf6294100000000000000000000000000000000000000080801ba0f2904491d7d84ada0d1d94ee35aac71a0cb52ea2f8c16545f7493c14737ba15ca002f2ee18f95a17f1ba5ed106d78ae430d1fc3c5f88eb86cfbce90c9bc09b20c4c0",
+                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a2c583fb9edd66fc38f8bbef9ad68ab7aec0abd25906b550361dc296fd71162a031ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0a0e6aff110a7903b6979be95fb1a2bf7b209d4bf82f3b8ef9e87d7487f449e5f02b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301c49f8203e880a00f3152ccab497a4aa1b33df213bb3eb05042e0afa28f8dc4b5765548708fa87388c0dc02f723b60908f862f86080018302bf6294100000000000000000000000000000000000000080801ba0f2904491d7d84ada0d1d94ee35aac71a0cb52ea2f8c16545f7493c14737ba15ca002f2ee18f95a17f1ba5ed106d78ae430d1fc3c5f88eb86cfbce90c9bc09b20c4c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x02bf62",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -203,7 +203,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5557ca209a96c8c0b35c54d51f1abea3373cb66833178b7746f42869eba320ea",
+        "lastblockhash" : "0x5e727e230a9b2136d4d50c3169eb0569636ca63195535becbf25449eaf51bdd6",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -277,287 +277,13 @@
             }
         }
     },
-    "callcall_00_OOGE_1_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1_d0g0v0Filler.json",
-            "sourceHash" : "548df84c0e9ac2ba75642b30a52e5c892eb2d311d1019cced2d4b5b7e79d3377"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x01c49f",
-                    "hash" : "0x4fa1ed0de3b4d0258f13aad5b166d758205c790d2a41e005c5707b2502b9bdb6",
-                    "mixHash" : "0x13c76d31a92502b5709e884418b2d2238cb146d6252f89462afd995b63e4b0a4",
-                    "nonce" : "0x200ea7cb8935bbcf",
-                    "number" : "0x01",
-                    "parentHash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
-                    "receiptTrie" : "0xe6aff110a7903b6979be95fb1a2bf7b209d4bf82f3b8ef9e87d7487f449e5f02",
-                    "stateRoot" : "0x9a2c583fb9edd66fc38f8bbef9ad68ab7aec0abd25906b550361dc296fd71162",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x31ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a2c583fb9edd66fc38f8bbef9ad68ab7aec0abd25906b550361dc296fd71162a031ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0a0e6aff110a7903b6979be95fb1a2bf7b209d4bf82f3b8ef9e87d7487f449e5f02b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301c49f8203e880a013c76d31a92502b5709e884418b2d2238cb146d6252f89462afd995b63e4b0a488200ea7cb8935bbcff862f86080018302bf6294100000000000000000000000000000000000000080801ba0f2904491d7d84ada0d1d94ee35aac71a0cb52ea2f8c16545f7493c14737ba15ca002f2ee18f95a17f1ba5ed106d78ae430d1fc3c5f88eb86cfbce90c9bc09b20c4c0",
-                "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" : "0x4fa1ed0de3b4d0258f13aad5b166d758205c790d2a41e005c5707b2502b9bdb6",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : {
-            "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_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1_d0g0v0Filler.json",
-            "sourceHash" : "548df84c0e9ac2ba75642b30a52e5c892eb2d311d1019cced2d4b5b7e79d3377"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x02bf62",
-                    "hash" : "0x8f1d49706b7c21da6813f9d275a1fa5d6c92234d28b84601b8b5f940eaa95bf5",
-                    "mixHash" : "0x62e784a3ba5bf85c184fb5b23ac98fc493094b1bc228bb5561c97293cdb16b4a",
-                    "nonce" : "0x4b41a0dcf041ee6c",
-                    "number" : "0x01",
-                    "parentHash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
-                    "receiptTrie" : "0x0bad4ccdf70a9d6d6c3ce257166ba55c860fc9c9538ec27d6e5357a05f8e8ae8",
-                    "stateRoot" : "0x645ed78df4efc384798ed3e62e832fd787884fb7e1e8321074b41ea6df2e1802",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x31ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0645ed78df4efc384798ed3e62e832fd787884fb7e1e8321074b41ea6df2e1802a031ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0a00bad4ccdf70a9d6d6c3ce257166ba55c860fc9c9538ec27d6e5357a05f8e8ae8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808302bf628203e880a062e784a3ba5bf85c184fb5b23ac98fc493094b1bc228bb5561c97293cdb16b4a884b41a0dcf041ee6cf862f86080018302bf6294100000000000000000000000000000000000000080801ba0f2904491d7d84ada0d1d94ee35aac71a0cb52ea2f8c16545f7493c14737ba15ca002f2ee18f95a17f1ba5ed106d78ae430d1fc3c5f88eb86cfbce90c9bc09b20c4c0",
-                "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" : "0x8f1d49706b7c21da6813f9d275a1fa5d6c92234d28b84601b8b5f940eaa95bf5",
-        "network" : "Frontier",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006001731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620186a0f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160025534600555",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f6bf62",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761409e",
-                "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_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1_d0g0v0Filler.json",
-            "sourceHash" : "548df84c0e9ac2ba75642b30a52e5c892eb2d311d1019cced2d4b5b7e79d3377"
+            "sourceHash" : "acf7a8711a539c07cb82df3263c48e33671d42d0992ec98b89b3f2538d179b9d"
         },
         "blocks" : [
             {
@@ -568,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x02bf62",
-                    "hash" : "0xe00197a9d5bc9374e7f6b7d66235a007db26b8b81af446fb424592d6c190e6a6",
-                    "mixHash" : "0x64c584f3343b821552a3b81d78df599f8f6c9bcb9a983d9c9d2f4205ed7aa7b8",
-                    "nonce" : "0x9764050ac8846058",
+                    "hash" : "0x0bc41be774283ba382ecdd7f2be94684db52f9b27ddbf0321d799bf99dde1b26",
+                    "mixHash" : "0xb60310c7e326b501acaca5213b12b9d6e652af10f095ccddd794fdfc8a5b007d",
+                    "nonce" : "0xc8870d1c738b5fd2",
                     "number" : "0x01",
                     "parentHash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
                     "receiptTrie" : "0x0bad4ccdf70a9d6d6c3ce257166ba55c860fc9c9538ec27d6e5357a05f8e8ae8",
@@ -579,10 +305,10 @@
                     "transactionsTrie" : "0x31ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0645ed78df4efc384798ed3e62e832fd787884fb7e1e8321074b41ea6df2e1802a031ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0a00bad4ccdf70a9d6d6c3ce257166ba55c860fc9c9538ec27d6e5357a05f8e8ae8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808302bf628203e880a064c584f3343b821552a3b81d78df599f8f6c9bcb9a983d9c9d2f4205ed7aa7b8889764050ac8846058f862f86080018302bf6294100000000000000000000000000000000000000080801ba0f2904491d7d84ada0d1d94ee35aac71a0cb52ea2f8c16545f7493c14737ba15ca002f2ee18f95a17f1ba5ed106d78ae430d1fc3c5f88eb86cfbce90c9bc09b20c4c0",
+                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0645ed78df4efc384798ed3e62e832fd787884fb7e1e8321074b41ea6df2e1802a031ebf0c647947ef6259774d4201abfaf7c7473fbb365f6925d3c6c038fdea0e0a00bad4ccdf70a9d6d6c3ce257166ba55c860fc9c9538ec27d6e5357a05f8e8ae8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808302bf628203e880a0b60310c7e326b501acaca5213b12b9d6e652af10f095ccddd794fdfc8a5b007d88c8870d1c738b5fd2f862f86080018302bf6294100000000000000000000000000000000000000080801ba0f2904491d7d84ada0d1d94ee35aac71a0cb52ea2f8c16545f7493c14737ba15ca002f2ee18f95a17f1ba5ed106d78ae430d1fc3c5f88eb86cfbce90c9bc09b20c4c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x02bf62",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -616,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe00197a9d5bc9374e7f6b7d66235a007db26b8b81af446fb424592d6c190e6a6",
+        "lastblockhash" : "0x0bc41be774283ba382ecdd7f2be94684db52f9b27ddbf0321d799bf99dde1b26",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2_d0g0v0.json
index 766e8a1c3..9a5852202 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcall_00_OOGE_2_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2_d0g0v0Filler.json",
-            "sourceHash" : "91aec5421f77082721461e16c812d0d89a843affd1ae0f0c14ed7891b7dcfe32"
+            "sourceHash" : "48e3741703c1d062d2d052ee66259c318597f07653eb6aa9a852611ab7af5359"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x01c49f",
-                    "hash" : "0x237a91682cb90e26d0e2fa0773b80d0da4f27ded560522f0b281759ef2962f36",
-                    "mixHash" : "0xead1fe560a8140cbdb5fdf18a5e01b7d3f7ceb7fd6898a76e4b177458f3f1d7b",
-                    "nonce" : "0xe5eb48f76f7791dc",
+                    "hash" : "0x3a4a8fff9008dac2103196282e9fcb100f4afe50eb120115d600ddd5ac2c6406",
+                    "mixHash" : "0x5016335c139bfc5ba6b8b93a9338279a3968b15ce194cd412a84c211f1eb0004",
+                    "nonce" : "0x547e96e3d9898ee4",
                     "number" : "0x01",
                     "parentHash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
                     "receiptTrie" : "0xaf0bacc9c88f7f366e10dc24b62a5e4188212ac033c9dfba47c66dd08aad3dcc",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xcb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0486f5bd5a1340f11066eb76821de4dd7900f62d08779ba00d4da29c0528e6704a0cb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0da0af0bacc9c88f7f366e10dc24b62a5e4188212ac033c9dfba47c66dd08aad3dccb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301c49f8203e880a0ead1fe560a8140cbdb5fdf18a5e01b7d3f7ceb7fd6898a76e4b177458f3f1d7b88e5eb48f76f7791dcf862f860800183024a3294100000000000000000000000000000000000000080801ba00e79a8e2bee8caba64c0ee950cbad88be43d0e969099460c5decd35d13e53281a044746499069c1fcd3d5960d630448c3d0d43ec25eeb7f4fbca1938b319529334c0",
+                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0486f5bd5a1340f11066eb76821de4dd7900f62d08779ba00d4da29c0528e6704a0cb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0da0af0bacc9c88f7f366e10dc24b62a5e4188212ac033c9dfba47c66dd08aad3dccb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301c49f8203e880a05016335c139bfc5ba6b8b93a9338279a3968b15ce194cd412a84c211f1eb000488547e96e3d9898ee4f862f860800183024a3294100000000000000000000000000000000000000080801ba00e79a8e2bee8caba64c0ee950cbad88be43d0e969099460c5decd35d13e53281a044746499069c1fcd3d5960d630448c3d0d43ec25eeb7f4fbca1938b319529334c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x024a32",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x237a91682cb90e26d0e2fa0773b80d0da4f27ded560522f0b281759ef2962f36",
+        "lastblockhash" : "0x3a4a8fff9008dac2103196282e9fcb100f4afe50eb120115d600ddd5ac2c6406",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -141,10 +141,10 @@
     "callcall_00_OOGE_2_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2_d0g0v0Filler.json",
-            "sourceHash" : "91aec5421f77082721461e16c812d0d89a843affd1ae0f0c14ed7891b7dcfe32"
+            "sourceHash" : "48e3741703c1d062d2d052ee66259c318597f07653eb6aa9a852611ab7af5359"
         },
         "blocks" : [
             {
@@ -155,9 +155,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x01c49f",
-                    "hash" : "0xe5b8bbbb961f3aaebe370e3b7d5e30ebc8b91524ea69b54e2cc82919964eb287",
-                    "mixHash" : "0x7ddc8bdd545c06f2706820406fb358917024c0cc83336209b77f1ce9b5eb94fb",
-                    "nonce" : "0x48e0c5615716958d",
+                    "hash" : "0x680b543498ec0a1ac6fa98dbe78b53a821de561a4164e354f6b0fe0298d3f4b2",
+                    "mixHash" : "0xf04bbc1c7cea5820f480e754dba1e04d47d11299255d40a0d744a991bc75f73b",
+                    "nonce" : "0xb2ad31b4b5be908c",
                     "number" : "0x01",
                     "parentHash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
                     "receiptTrie" : "0xe6aff110a7903b6979be95fb1a2bf7b209d4bf82f3b8ef9e87d7487f449e5f02",
@@ -166,10 +166,10 @@
                     "transactionsTrie" : "0xcb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a2c583fb9edd66fc38f8bbef9ad68ab7aec0abd25906b550361dc296fd71162a0cb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0da0e6aff110a7903b6979be95fb1a2bf7b209d4bf82f3b8ef9e87d7487f449e5f02b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301c49f8203e880a07ddc8bdd545c06f2706820406fb358917024c0cc83336209b77f1ce9b5eb94fb8848e0c5615716958df862f860800183024a3294100000000000000000000000000000000000000080801ba00e79a8e2bee8caba64c0ee950cbad88be43d0e969099460c5decd35d13e53281a044746499069c1fcd3d5960d630448c3d0d43ec25eeb7f4fbca1938b319529334c0",
+                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a2c583fb9edd66fc38f8bbef9ad68ab7aec0abd25906b550361dc296fd71162a0cb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0da0e6aff110a7903b6979be95fb1a2bf7b209d4bf82f3b8ef9e87d7487f449e5f02b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301c49f8203e880a0f04bbc1c7cea5820f480e754dba1e04d47d11299255d40a0d744a991bc75f73b88b2ad31b4b5be908cf862f860800183024a3294100000000000000000000000000000000000000080801ba00e79a8e2bee8caba64c0ee950cbad88be43d0e969099460c5decd35d13e53281a044746499069c1fcd3d5960d630448c3d0d43ec25eeb7f4fbca1938b319529334c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x024a32",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -203,7 +203,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe5b8bbbb961f3aaebe370e3b7d5e30ebc8b91524ea69b54e2cc82919964eb287",
+        "lastblockhash" : "0x680b543498ec0a1ac6fa98dbe78b53a821de561a4164e354f6b0fe0298d3f4b2",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -277,287 +277,13 @@
             }
         }
     },
-    "callcall_00_OOGE_2_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2_d0g0v0Filler.json",
-            "sourceHash" : "91aec5421f77082721461e16c812d0d89a843affd1ae0f0c14ed7891b7dcfe32"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x01c49f",
-                    "hash" : "0x8621a7deeed2332ec2dbbd00ad385832c49c424b07527e3af53858dfc9d64259",
-                    "mixHash" : "0xa981cc86fd0e31c33fee7fbf6397c400ea7637fe980d386d309b642140eb674a",
-                    "nonce" : "0x9306054864a33f30",
-                    "number" : "0x01",
-                    "parentHash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
-                    "receiptTrie" : "0xe6aff110a7903b6979be95fb1a2bf7b209d4bf82f3b8ef9e87d7487f449e5f02",
-                    "stateRoot" : "0x9a2c583fb9edd66fc38f8bbef9ad68ab7aec0abd25906b550361dc296fd71162",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xcb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a2c583fb9edd66fc38f8bbef9ad68ab7aec0abd25906b550361dc296fd71162a0cb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0da0e6aff110a7903b6979be95fb1a2bf7b209d4bf82f3b8ef9e87d7487f449e5f02b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301c49f8203e880a0a981cc86fd0e31c33fee7fbf6397c400ea7637fe980d386d309b642140eb674a889306054864a33f30f862f860800183024a3294100000000000000000000000000000000000000080801ba00e79a8e2bee8caba64c0ee950cbad88be43d0e969099460c5decd35d13e53281a044746499069c1fcd3d5960d630448c3d0d43ec25eeb7f4fbca1938b319529334c0",
-                "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" : "0x8621a7deeed2332ec2dbbd00ad385832c49c424b07527e3af53858dfc9d64259",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : {
-            "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_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2_d0g0v0Filler.json",
-            "sourceHash" : "91aec5421f77082721461e16c812d0d89a843affd1ae0f0c14ed7891b7dcfe32"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x024a32",
-                    "hash" : "0x6c8a8c1bb218c491e7c7ab2a8f1dda0a86a26440f187e2de2a2eedae93a768da",
-                    "mixHash" : "0x3f3aaf0f6c90482675cb62e6f12f109f7434a0be216e7d905d3639bd71ef13ff",
-                    "nonce" : "0xdddc9a1be30e4a04",
-                    "number" : "0x01",
-                    "parentHash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
-                    "receiptTrie" : "0x9b3c24098d829140f2c7274dd582fa0010ced14c76a9f9359dbba25f04612bd4",
-                    "stateRoot" : "0xbc5aa2e0a24bfd85afd0939d8100f0b8e2adc115105eefde52615fbbb4a1b7b3",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xcb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc5aa2e0a24bfd85afd0939d8100f0b8e2adc115105eefde52615fbbb4a1b7b3a0cb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0da09b3c24098d829140f2c7274dd582fa0010ced14c76a9f9359dbba25f04612bd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083024a328203e880a03f3aaf0f6c90482675cb62e6f12f109f7434a0be216e7d905d3639bd71ef13ff88dddc9a1be30e4a04f862f860800183024a3294100000000000000000000000000000000000000080801ba00e79a8e2bee8caba64c0ee950cbad88be43d0e969099460c5decd35d13e53281a044746499069c1fcd3d5960d630448c3d0d43ec25eeb7f4fbca1938b319529334c0",
-                "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" : "0x6c8a8c1bb218c491e7c7ab2a8f1dda0a86a26440f187e2de2a2eedae93a768da",
-        "network" : "Frontier",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006001731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620186a0f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160025534600555",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f64a32",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a761b5ce",
-                "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_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2_d0g0v0Filler.json",
-            "sourceHash" : "91aec5421f77082721461e16c812d0d89a843affd1ae0f0c14ed7891b7dcfe32"
+            "sourceHash" : "48e3741703c1d062d2d052ee66259c318597f07653eb6aa9a852611ab7af5359"
         },
         "blocks" : [
             {
@@ -568,9 +294,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x024a32",
-                    "hash" : "0xcb075aa73f87289cb8e94ee35e9ae87fd55b6474f80bc6957747254cd3d8e6a4",
-                    "mixHash" : "0x24e87b3b3f1d406a42777187bf6799781c77e54ada53b51c183715236fd8f0df",
-                    "nonce" : "0xf50015c397f181ef",
+                    "hash" : "0x7a73098eaa990232c9a0cedf2f9726869132be19bc6acf0e2bd59ef0ece81922",
+                    "mixHash" : "0xf03d5fd82e4b2998f29e8ea763f465c5e291cea793383ce76c07ad1ac8d7854a",
+                    "nonce" : "0xdfc61c83b5dc30d5",
                     "number" : "0x01",
                     "parentHash" : "0xec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7c",
                     "receiptTrie" : "0x9b3c24098d829140f2c7274dd582fa0010ced14c76a9f9359dbba25f04612bd4",
@@ -579,10 +305,10 @@
                     "transactionsTrie" : "0xcb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc5aa2e0a24bfd85afd0939d8100f0b8e2adc115105eefde52615fbbb4a1b7b3a0cb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0da09b3c24098d829140f2c7274dd582fa0010ced14c76a9f9359dbba25f04612bd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083024a328203e880a024e87b3b3f1d406a42777187bf6799781c77e54ada53b51c183715236fd8f0df88f50015c397f181eff862f860800183024a3294100000000000000000000000000000000000000080801ba00e79a8e2bee8caba64c0ee950cbad88be43d0e969099460c5decd35d13e53281a044746499069c1fcd3d5960d630448c3d0d43ec25eeb7f4fbca1938b319529334c0",
+                "rlp" : "0xf90261f901f9a0ec033b933bb242708ac8e81a50179afdcf9953496b3250208f5f1c1cd554fd7ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc5aa2e0a24bfd85afd0939d8100f0b8e2adc115105eefde52615fbbb4a1b7b3a0cb4277246f411593d581ebcda81e3c60a708e8a36a3843b87f1e4a368c7d1b0da09b3c24098d829140f2c7274dd582fa0010ced14c76a9f9359dbba25f04612bd4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083024a328203e880a0f03d5fd82e4b2998f29e8ea763f465c5e291cea793383ce76c07ad1ac8d7854a88dfc61c83b5dc30d5f862f860800183024a3294100000000000000000000000000000000000000080801ba00e79a8e2bee8caba64c0ee950cbad88be43d0e969099460c5decd35d13e53281a044746499069c1fcd3d5960d630448c3d0d43ec25eeb7f4fbca1938b319529334c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x024a32",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -616,7 +342,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df714130209209838b82705a7b5d9cf7c716009b5f305f7eda4922384b481102a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcb075aa73f87289cb8e94ee35e9ae87fd55b6474f80bc6957747254cd3d8e6a4",
+        "lastblockhash" : "0x7a73098eaa990232c9a0cedf2f9726869132be19bc6acf0e2bd59ef0ece81922",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer_d0g0v0.json
index 34851e2b7..164307a66 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcall_00_OOGE_valueTransfer_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer_d0g0v0Filler.json",
-            "sourceHash" : "d6231fa63422823aa908b0b5bd6e9952e800ce83aee63155c394dfbee35d7010"
+            "sourceHash" : "fac9c7b4cf11d99ef890076814e7f21251e74e4ac1763aac071836392a1f69ba"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x017689",
-                    "hash" : "0xf5223252a1e43b65d64d55d7cd681d5f0d46809a3e673f5bf46394359a345db8",
-                    "mixHash" : "0x8c8073fab441b44f2d57393e146c54bffe2a14f56b8f5645904122aa204353ff",
-                    "nonce" : "0x748bab6a7652539a",
+                    "hash" : "0xe4111589796850441cabad4203d1fd0254394b60d978d88be4a893e078b6568b",
+                    "mixHash" : "0x00399b72a5c95777379a59e1cd624fa5cd58d7feec99fabb6320a30dcf44d862",
+                    "nonce" : "0x15909dd20b0b7dcb",
                     "number" : "0x01",
                     "parentHash" : "0x843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520f",
                     "receiptTrie" : "0xb3c583aa26aca0cce389bccbf2a99a4f086449ddf52712fc4797b2997a5e49f7",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d91975d55265c003fc25b50821ddb29ee68a79208f57ff3ee8890bf18feba06a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0b3c583aa26aca0cce389bccbf2a99a4f086449ddf52712fc4797b2997a5e49f7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830176898203e880a08c8073fab441b44f2d57393e146c54bffe2a14f56b8f5645904122aa204353ff88748bab6a7652539af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03d91975d55265c003fc25b50821ddb29ee68a79208f57ff3ee8890bf18feba06a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0b3c583aa26aca0cce389bccbf2a99a4f086449ddf52712fc4797b2997a5e49f7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830176898203e880a000399b72a5c95777379a59e1cd624fa5cd58d7feec99fabb6320a30dcf44d8628815909dd20b0b7dcbf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a6a0701eaa525e665d8440278fb01df0106e5cbc5ce34943703372d0afed495a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf5223252a1e43b65d64d55d7cd681d5f0d46809a3e673f5bf46394359a345db8",
+        "lastblockhash" : "0xe4111589796850441cabad4203d1fd0254394b60d978d88be4a893e078b6568b",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -140,10 +140,10 @@
     "callcall_00_OOGE_valueTransfer_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer_d0g0v0Filler.json",
-            "sourceHash" : "d6231fa63422823aa908b0b5bd6e9952e800ce83aee63155c394dfbee35d7010"
+            "sourceHash" : "fac9c7b4cf11d99ef890076814e7f21251e74e4ac1763aac071836392a1f69ba"
         },
         "blocks" : [
             {
@@ -154,9 +154,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x017689",
-                    "hash" : "0x8dae234870a53806f9610d8d136a40e399368ada696a8ccbb5e2a4a9acf916f1",
-                    "mixHash" : "0xeebd4f22d78b77c7d73c2be47e3537699edc66c7023879ccaa91bc8a5f589257",
-                    "nonce" : "0x2fe1bf43d800ce71",
+                    "hash" : "0xcd20144c83893ac90983a0e5151745c39737fd5bac7e243dc4570fbbf3c2f78a",
+                    "mixHash" : "0xbc19c79b9833fb5b193a06c999682456c3b2501a5a37aa983ebdf959f00a828c",
+                    "nonce" : "0x3db16640ac997e72",
                     "number" : "0x01",
                     "parentHash" : "0x843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520f",
                     "receiptTrie" : "0xea4e401adec27a31207e403178dc668b5898c8e296c4b7dc3c798db7a2d0d8e7",
@@ -165,10 +165,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045a5d8970629c42a663dddbad82f557be23909ccd44cb5bd86aacaf28f039ffaa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ea4e401adec27a31207e403178dc668b5898c8e296c4b7dc3c798db7a2d0d8e7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830176898203e880a0eebd4f22d78b77c7d73c2be47e3537699edc66c7023879ccaa91bc8a5f589257882fe1bf43d800ce71f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045a5d8970629c42a663dddbad82f557be23909ccd44cb5bd86aacaf28f039ffaa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ea4e401adec27a31207e403178dc668b5898c8e296c4b7dc3c798db7a2d0d8e7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830176898203e880a0bc19c79b9833fb5b193a06c999682456c3b2501a5a37aa983ebdf959f00a828c883db16640ac997e72f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -202,7 +202,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a6a0701eaa525e665d8440278fb01df0106e5cbc5ce34943703372d0afed495a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8dae234870a53806f9610d8d136a40e399368ada696a8ccbb5e2a4a9acf916f1",
+        "lastblockhash" : "0xcd20144c83893ac90983a0e5151745c39737fd5bac7e243dc4570fbbf3c2f78a",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -275,286 +275,13 @@
             }
         }
     },
-    "callcall_00_OOGE_valueTransfer_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer_d0g0v0Filler.json",
-            "sourceHash" : "d6231fa63422823aa908b0b5bd6e9952e800ce83aee63155c394dfbee35d7010"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x017689",
-                    "hash" : "0x31351c15438f1c700d72f8d4f7e46fca423c6c45495221866bae9c4169eb8a02",
-                    "mixHash" : "0xef8da2b02dd9c462cc09c7b3578325de685520880ccda23305ac9b367a7ea657",
-                    "nonce" : "0x41432ffd615c94b3",
-                    "number" : "0x01",
-                    "parentHash" : "0x843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520f",
-                    "receiptTrie" : "0xea4e401adec27a31207e403178dc668b5898c8e296c4b7dc3c798db7a2d0d8e7",
-                    "stateRoot" : "0x45a5d8970629c42a663dddbad82f557be23909ccd44cb5bd86aacaf28f039ffa",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045a5d8970629c42a663dddbad82f557be23909ccd44cb5bd86aacaf28f039ffaa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ea4e401adec27a31207e403178dc668b5898c8e296c4b7dc3c798db7a2d0d8e7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830176898203e880a0ef8da2b02dd9c462cc09c7b3578325de685520880ccda23305ac9b367a7ea6578841432ffd615c94b3f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x31351c15438f1c700d72f8d4f7e46fca423c6c45495221866bae9c4169eb8a02",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : {
-            "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_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer_d0g0v0Filler.json",
-            "sourceHash" : "d6231fa63422823aa908b0b5bd6e9952e800ce83aee63155c394dfbee35d7010"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x029fe0",
-                    "hash" : "0x8cf8cabf3f390fea4cfea5a8cd058eba3ceae546d4a576d5fbcc95f23756f0e1",
-                    "mixHash" : "0x0ea42b92c065aae53d86f9eeccaa08577c499ff5271244b89e7b8e743aefcab3",
-                    "nonce" : "0x125f097ef8a9ce0b",
-                    "number" : "0x01",
-                    "parentHash" : "0x843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520f",
-                    "receiptTrie" : "0xf49fb1832b775e8a5af1e54424b020cdf256bc97502295d5ecb62c2e68275c08",
-                    "stateRoot" : "0xccda66ffce3d74f032171087efe4c229b54704c2ebdb4e5119a8e5fc8b9b1366",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ccda66ffce3d74f032171087efe4c229b54704c2ebdb4e5119a8e5fc8b9b1366a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f49fb1832b775e8a5af1e54424b020cdf256bc97502295d5ecb62c2e68275c08b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a00ea42b92c065aae53d86f9eeccaa08577c499ff5271244b89e7b8e743aefcab388125f097ef8a9ce0bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x8cf8cabf3f390fea4cfea5a8cd058eba3ceae546d4a576d5fbcc95f23756f0e1",
-        "network" : "Frontier",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006014731000000000000000000000000000000000000001620249f0f1600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000600a73100000000000000000000000000000000000000261c350f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f69fe0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7616020",
-                "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_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer_d0g0v0Filler.json",
-            "sourceHash" : "d6231fa63422823aa908b0b5bd6e9952e800ce83aee63155c394dfbee35d7010"
+            "sourceHash" : "fac9c7b4cf11d99ef890076814e7f21251e74e4ac1763aac071836392a1f69ba"
         },
         "blocks" : [
             {
@@ -565,9 +292,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "0xdcbd7755e35fc151ef86f08dfc82ffe394f91922faa006b47850d6f628ddb330",
-                    "mixHash" : "0x9245778b6481dcf2092c5149690d54b24e37871bee218cffbf478d3d9a0d7258",
-                    "nonce" : "0x5ac70652869b7d76",
+                    "hash" : "0xe4d5db796cbfbc56e88af454f799f0324141b810eb71158cd3f3bf0939db8b29",
+                    "mixHash" : "0xc45467cf40758316a87ed59867b33a5746fcb3666eabcfbbce017df85165086f",
+                    "nonce" : "0xa37119b265b1da0d",
                     "number" : "0x01",
                     "parentHash" : "0x843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520f",
                     "receiptTrie" : "0xf49fb1832b775e8a5af1e54424b020cdf256bc97502295d5ecb62c2e68275c08",
@@ -576,10 +303,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ccda66ffce3d74f032171087efe4c229b54704c2ebdb4e5119a8e5fc8b9b1366a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f49fb1832b775e8a5af1e54424b020cdf256bc97502295d5ecb62c2e68275c08b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a09245778b6481dcf2092c5149690d54b24e37871bee218cffbf478d3d9a0d7258885ac70652869b7d76f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0843c1dbd69513ee00eb56d03bb9a77102f2597c9c6160795f20fcbeb8a05520fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ccda66ffce3d74f032171087efe4c229b54704c2ebdb4e5119a8e5fc8b9b1366a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f49fb1832b775e8a5af1e54424b020cdf256bc97502295d5ecb62c2e68275c08b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a0c45467cf40758316a87ed59867b33a5746fcb3666eabcfbbce017df85165086f88a37119b265b1da0df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -613,7 +340,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a6a0701eaa525e665d8440278fb01df0106e5cbc5ce34943703372d0afed495a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdcbd7755e35fc151ef86f08dfc82ffe394f91922faa006b47850d6f628ddb330",
+        "lastblockhash" : "0xe4d5db796cbfbc56e88af454f799f0324141b810eb71158cd3f3bf0939db8b29",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter_d0g0v0.json
index 2f5c8ab9c..2af017521 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcall_000_OOGMAfter_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "9bd366769356c56fab6cbda11b05a36c3b06734a46437783c280b1c88538c2da"
+            "sourceHash" : "1d994c44d385da1cacc0713cc58a4b562ce3ad03c72bd32d26237b50028f3352"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0xad119b4b6e08de85813e9b70cfaf24c8488d731d79a3dfe12aefe10564602c5d",
-                    "mixHash" : "0x646c9ee52e8ccdd9682f69f035994f372ec8ee09dbc7bebe1bbd452db7799606",
-                    "nonce" : "0xe89be258436901fb",
+                    "hash" : "0xd99bfac02cd1b7c5579573f0d132f60a6bee58f59139d5c454c9054c2049833d",
+                    "mixHash" : "0x58b8ce354a085cb0d74c7950038169e828df43b7a80f12d8d136d5d9f3243ef8",
+                    "nonce" : "0x03b18985f46229aa",
                     "number" : "0x01",
                     "parentHash" : "0x00c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9c",
                     "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a000c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f2b5c393869a7d9747459b3d7267205ce906f9193e0aba2b186aaacbaeb409e1a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0646c9ee52e8ccdd9682f69f035994f372ec8ee09dbc7bebe1bbd452db779960688e89be258436901fbf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a000c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f2b5c393869a7d9747459b3d7267205ce906f9193e0aba2b186aaacbaeb409e1a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a058b8ce354a085cb0d74c7950038169e828df43b7a80f12d8d136d5d9f3243ef88803b18985f46229aaf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987abaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xad119b4b6e08de85813e9b70cfaf24c8488d731d79a3dfe12aefe10564602c5d",
+        "lastblockhash" : "0xd99bfac02cd1b7c5579573f0d132f60a6bee58f59139d5c454c9054c2049833d",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -152,10 +152,10 @@
     "callcallcall_000_OOGMAfter_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "9bd366769356c56fab6cbda11b05a36c3b06734a46437783c280b1c88538c2da"
+            "sourceHash" : "1d994c44d385da1cacc0713cc58a4b562ce3ad03c72bd32d26237b50028f3352"
         },
         "blocks" : [
             {
@@ -166,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0x97038505390505502d462620dbda4aaeffa6de83f418ce8e7959b6a5b972f0bd",
-                    "mixHash" : "0xc115f1827c4f6a07f88d738b2a4d363bc7fe067c684e76543d3d6220576fc8a2",
-                    "nonce" : "0xd7b57feec592057f",
+                    "hash" : "0x31c297a9bb866301c6b6be8dc5a585fae21adb19f9b462c6c18c089e21c1be8f",
+                    "mixHash" : "0x722c35b87ba6010fb400d7c7a63eff7fc8729b0037da76e3f52a1058f1d7cd83",
+                    "nonce" : "0xef05bfa9aa135112",
                     "number" : "0x01",
                     "parentHash" : "0x00c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9c",
                     "receiptTrie" : "0xe49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254",
@@ -177,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a000c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5195971f320a4da1b922a1643b2274f65a9e42903dcb65820491645c7b16974a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0c115f1827c4f6a07f88d738b2a4d363bc7fe067c684e76543d3d6220576fc8a288d7b57feec592057ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a000c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5195971f320a4da1b922a1643b2274f65a9e42903dcb65820491645c7b16974a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0722c35b87ba6010fb400d7c7a63eff7fc8729b0037da76e3f52a1058f1d7cd8388ef05bfa9aa135112f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -214,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987abaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x97038505390505502d462620dbda4aaeffa6de83f418ce8e7959b6a5b972f0bd",
+        "lastblockhash" : "0x31c297a9bb866301c6b6be8dc5a585fae21adb19f9b462c6c18c089e21c1be8f",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -299,312 +299,13 @@
             }
         }
     },
-    "callcallcall_000_OOGMAfter_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "9bd366769356c56fab6cbda11b05a36c3b06734a46437783c280b1c88538c2da"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0155fd",
-                    "hash" : "0x2a1f23e9aacd90f9190f946af6a8678f37e71ffd5adeb687b66cdfce99226922",
-                    "mixHash" : "0xc52f52dcfc0bf7cbf213546784ba14e4a9433892657cff900e5988e1eb5cc850",
-                    "nonce" : "0x9e3bce69f8184e20",
-                    "number" : "0x01",
-                    "parentHash" : "0x00c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9c",
-                    "receiptTrie" : "0xe49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254",
-                    "stateRoot" : "0xe5195971f320a4da1b922a1643b2274f65a9e42903dcb65820491645c7b16974",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a000c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5195971f320a4da1b922a1643b2274f65a9e42903dcb65820491645c7b16974a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e49d0f9fc2272839922df48862a82a1922e8a21f1657819bd0ae0c81fb295254b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0c52f52dcfc0bf7cbf213546784ba14e4a9433892657cff900e5988e1eb5cc850889e3bce69f8184e20f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x2a1f23e9aacd90f9190f946af6a8678f37e71ffd5adeb687b66cdfce99226922",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : {
-            "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_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "9bd366769356c56fab6cbda11b05a36c3b06734a46437783c280b1c88538c2da"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0150cc",
-                    "hash" : "0x1c9a44cdebdd778e056bd8d1f1b57b832e5b55a28da20d76de4575cbe420e072",
-                    "mixHash" : "0xe8a2f0ae79db2af81522892f10f17796a5c25773af6e5bf8eb4719d8f31c8efc",
-                    "nonce" : "0xc8cc2cc8179234ae",
-                    "number" : "0x01",
-                    "parentHash" : "0x00c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9c",
-                    "receiptTrie" : "0x0b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62",
-                    "stateRoot" : "0x44b3ed7f2b5c4631db6e6caa3087162374af3b130aeed8fb064ebe82c148006b",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a000c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044b3ed7f2b5c4631db6e6caa3087162374af3b130aeed8fb064ebe82c148006ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0e8a2f0ae79db2af81522892f10f17796a5c25773af6e5bf8eb4719d8f31c8efc88c8cc2cc8179234aef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x1c9a44cdebdd778e056bd8d1f1b57b832e5b55a28da20d76de4575cbe420e072",
-        "network" : "Frontier",
-        "postState" : {
-            "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" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550cc",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af34",
-                "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_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "9bd366769356c56fab6cbda11b05a36c3b06734a46437783c280b1c88538c2da"
+            "sourceHash" : "1d994c44d385da1cacc0713cc58a4b562ce3ad03c72bd32d26237b50028f3352"
         },
         "blocks" : [
             {
@@ -615,9 +316,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0x6e7ae64d3268fe589a247bc0c2a2c97fd3cbe41b2e5cea14419f83fcf620a42f",
-                    "mixHash" : "0x61462e1049f03c5abadad3b75d5b70157e2dd2d149bc265dd1a90a85b16e8115",
-                    "nonce" : "0xf1d5ace2220f2b89",
+                    "hash" : "0x6b05bf2eef2398c1eb014ad9c43dfb69c856b0b24a77f16a1d423ad7fc83489e",
+                    "mixHash" : "0x77f6f41c9b9552e35fe6397feb599a56ff6795a5527899b3ed76114d3071c3e5",
+                    "nonce" : "0x329b517775cefad5",
                     "number" : "0x01",
                     "parentHash" : "0x00c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9c",
                     "receiptTrie" : "0x0b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62",
@@ -626,10 +327,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a000c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044b3ed7f2b5c4631db6e6caa3087162374af3b130aeed8fb064ebe82c148006ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a061462e1049f03c5abadad3b75d5b70157e2dd2d149bc265dd1a90a85b16e811588f1d5ace2220f2b89f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a000c5667c81bcbafdf4a72061f49404f55ab4d5664624da8cc481b1e530640c9ca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044b3ed7f2b5c4631db6e6caa3087162374af3b130aeed8fb064ebe82c148006ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00b80636d9b7442aa8eab542aff475277098fd9e60ce65f4a2fff162ed056ab62b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a077f6f41c9b9552e35fe6397feb599a56ff6795a5527899b3ed76114d3071c3e588329b517775cefad5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -663,7 +364,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0802ec58d192c678347786f770ffeca5db4d8f37e21c96d5da741738cc2987abaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6e7ae64d3268fe589a247bc0c2a2c97fd3cbe41b2e5cea14419f83fcf620a42f",
+        "lastblockhash" : "0x6b05bf2eef2398c1eb014ad9c43dfb69c856b0b24a77f16a1d423ad7fc83489e",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1_d0g0v0.json
index 3b4c8bc7f..b6a2c6bb5 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_OOGMAfter_1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "7cc29efd8dd17d1f24c39800863e8447c1363167c9057671fbda946565577b18"
+            "sourceHash" : "484354b60bc0010f230c66efc7b6ce8ad9fd4ebb954e3d0ead6d10b9f66cbd6a"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155f6",
-                    "hash" : "0x73014c4e738103da5ddeb3aedd86acbd5e6f3df202af3af57b8473fdc9d999f1",
-                    "mixHash" : "0x93e2c8b6a4a5ebb7387e313d75df69f11e4dadde9f764f32f1675566ec934354",
-                    "nonce" : "0x046a0f56f5cdc197",
+                    "hash" : "0xd36820bb749f1b326b72acef1f52195329031cf609c6d21d25dd6e57f35ab8da",
+                    "mixHash" : "0xfa00b3fab90b8ee7b4f38bb97fecfe1f9fc6d2df6535db007acfd0de84964dac",
+                    "nonce" : "0xe82ecce3da5fb37e",
                     "number" : "0x01",
                     "parentHash" : "0x00d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6",
                     "receiptTrie" : "0x05fd6e125cf4882932953e984d97095e88b58aa0a28c3ac2b05f43e41afeb047",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a000d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0679df7d79ca850815b1f7942d5711e84b118ae52bede432b83f1d4067ca4d108a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea005fd6e125cf4882932953e984d97095e88b58aa0a28c3ac2b05f43e41afeb047b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f68203e880a093e2c8b6a4a5ebb7387e313d75df69f11e4dadde9f764f32f1675566ec93435488046a0f56f5cdc197f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a000d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0679df7d79ca850815b1f7942d5711e84b118ae52bede432b83f1d4067ca4d108a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea005fd6e125cf4882932953e984d97095e88b58aa0a28c3ac2b05f43e41afeb047b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f68203e880a0fa00b3fab90b8ee7b4f38bb97fecfe1f9fc6d2df6535db007acfd0de84964dac88e82ecce3da5fb37ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0485a6f52025c76f783a581db3d094fad582aaa62f21d5741d175452b81a67dd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x73014c4e738103da5ddeb3aedd86acbd5e6f3df202af3af57b8473fdc9d999f1",
+        "lastblockhash" : "0xd36820bb749f1b326b72acef1f52195329031cf609c6d21d25dd6e57f35ab8da",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -152,10 +152,10 @@
     "callcallcallcode_001_OOGMAfter_1_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "7cc29efd8dd17d1f24c39800863e8447c1363167c9057671fbda946565577b18"
+            "sourceHash" : "484354b60bc0010f230c66efc7b6ce8ad9fd4ebb954e3d0ead6d10b9f66cbd6a"
         },
         "blocks" : [
             {
@@ -166,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155f6",
-                    "hash" : "0x5f147c4fadaba9eb80d41abb80c31ae0115c3b3f4e756492ba2bf46109ccd16e",
-                    "mixHash" : "0x8197ac3f5ad58cd0650abe1da4aa5f9462289558f5b3745b7e4fa1f8c287f279",
-                    "nonce" : "0xcdf60b0537d65b72",
+                    "hash" : "0xd302698f3e58eca18ebc175533d625b1beea44bf1d83b429cbf139954eb86f11",
+                    "mixHash" : "0xd9cd4dbf47bca3b3e93401e1545b808991bc7239011d385a4b4200daf1b9b66e",
+                    "nonce" : "0x3c2095830003f2e9",
                     "number" : "0x01",
                     "parentHash" : "0x00d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6",
                     "receiptTrie" : "0xaf6da6153fd508de6ae6f5973c541dd71fa8e5f1a04be228ad6ead940a08d313",
@@ -177,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a000d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036fc1cde48a007dd72ac83fadbdd74b2bb507a2afdc1f5f7777db1d3bfc7c37da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0af6da6153fd508de6ae6f5973c541dd71fa8e5f1a04be228ad6ead940a08d313b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f68203e880a08197ac3f5ad58cd0650abe1da4aa5f9462289558f5b3745b7e4fa1f8c287f27988cdf60b0537d65b72f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a000d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036fc1cde48a007dd72ac83fadbdd74b2bb507a2afdc1f5f7777db1d3bfc7c37da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0af6da6153fd508de6ae6f5973c541dd71fa8e5f1a04be228ad6ead940a08d313b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f68203e880a0d9cd4dbf47bca3b3e93401e1545b808991bc7239011d385a4b4200daf1b9b66e883c2095830003f2e9f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -214,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0485a6f52025c76f783a581db3d094fad582aaa62f21d5741d175452b81a67dd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5f147c4fadaba9eb80d41abb80c31ae0115c3b3f4e756492ba2bf46109ccd16e",
+        "lastblockhash" : "0xd302698f3e58eca18ebc175533d625b1beea44bf1d83b429cbf139954eb86f11",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -299,163 +299,13 @@
             }
         }
     },
-    "callcallcallcode_001_OOGMAfter_1_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "7cc29efd8dd17d1f24c39800863e8447c1363167c9057671fbda946565577b18"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0155f6",
-                    "hash" : "0xaed62657a4b28051ee8ee0b4569b75aa5ca8264eaa655715532bd87436ba22d3",
-                    "mixHash" : "0xf2804d6a2276ce7c514c4ef23c3573ad5e5f379981d54b5fc40ce291d6b4b18f",
-                    "nonce" : "0xc5e2bfd7edb637c8",
-                    "number" : "0x01",
-                    "parentHash" : "0x00d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6",
-                    "receiptTrie" : "0xaf6da6153fd508de6ae6f5973c541dd71fa8e5f1a04be228ad6ead940a08d313",
-                    "stateRoot" : "0x36fc1cde48a007dd72ac83fadbdd74b2bb507a2afdc1f5f7777db1d3bfc7c37d",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a000d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036fc1cde48a007dd72ac83fadbdd74b2bb507a2afdc1f5f7777db1d3bfc7c37da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0af6da6153fd508de6ae6f5973c541dd71fa8e5f1a04be228ad6ead940a08d313b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f68203e880a0f2804d6a2276ce7c514c4ef23c3573ad5e5f379981d54b5fc40ce291d6b4b18f88c5e2bfd7edb637c8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0xaed62657a4b28051ee8ee0b4569b75aa5ca8264eaa655715532bd87436ba22d3",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : {
-            "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_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "7cc29efd8dd17d1f24c39800863e8447c1363167c9057671fbda946565577b18"
+            "sourceHash" : "484354b60bc0010f230c66efc7b6ce8ad9fd4ebb954e3d0ead6d10b9f66cbd6a"
         },
         "blocks" : [
             {
@@ -466,9 +316,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150ce",
-                    "hash" : "0x2b27449683f1ccf7224561a799124f01092f204a7ab69368fc14ad97828fec7e",
-                    "mixHash" : "0x262db055a0d3344b678c12542c599f8740dac1325c237d97fd2fba50f7d89931",
-                    "nonce" : "0x0e0a6137977eb5d0",
+                    "hash" : "0x31ec8442d005842cf7bdbe76cf52154e796298a5bc8bdd1f7b703c91f06c9869",
+                    "mixHash" : "0xaba26d56853bceaa7166cc86cba1e4e7880c3c74827b054dac7ee171fee7c6ba",
+                    "nonce" : "0xc89a05b29e26afa0",
                     "number" : "0x01",
                     "parentHash" : "0x00d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6",
                     "receiptTrie" : "0x60ae7e81b11deabe23e5d1ef468b928319929ba86da233309de14723a1194bcf",
@@ -477,10 +327,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a000d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed938afa49c128465cae4f34d95098d6353ee7278a0fad8256b3a0d47c151219a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea060ae7e81b11deabe23e5d1ef468b928319929ba86da233309de14723a1194bcfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150ce8203e880a0262db055a0d3344b678c12542c599f8740dac1325c237d97fd2fba50f7d89931880e0a6137977eb5d0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a000d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed938afa49c128465cae4f34d95098d6353ee7278a0fad8256b3a0d47c151219a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea060ae7e81b11deabe23e5d1ef468b928319929ba86da233309de14723a1194bcfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150ce8203e880a0aba26d56853bceaa7166cc86cba1e4e7880c3c74827b054dac7ee171fee7c6ba88c89a05b29e26afa0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -514,7 +364,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0485a6f52025c76f783a581db3d094fad582aaa62f21d5741d175452b81a67dd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2b27449683f1ccf7224561a799124f01092f204a7ab69368fc14ad97828fec7e",
+        "lastblockhash" : "0x31ec8442d005842cf7bdbe76cf52154e796298a5bc8bdd1f7b703c91f06c9869",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -602,10 +452,10 @@
     "callcallcallcode_001_OOGMAfter_1_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "7cc29efd8dd17d1f24c39800863e8447c1363167c9057671fbda946565577b18"
+            "sourceHash" : "484354b60bc0010f230c66efc7b6ce8ad9fd4ebb954e3d0ead6d10b9f66cbd6a"
         },
         "blocks" : [
             {
@@ -616,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cd",
-                    "hash" : "0x3aa9ea4c2817a6f7e84b5b90b355c0ec4fe1e09e62e5cc52f9baebae4855c1c1",
-                    "mixHash" : "0x5de063ee4552e19328d55b1f7e9feb2388c726c4e93b3c689f0723b2b0dbc9b7",
-                    "nonce" : "0xd22d9d1a45574732",
+                    "hash" : "0x3c90020397859fa96915e2bd8ad4d5097716d795e9364b73bbd4b9b462f659f8",
+                    "mixHash" : "0x72fa867eb352864bed935f8523d416058f12edb4d497f03a01c5cdd996eb8ad3",
+                    "nonce" : "0xd269e3c9f7ef8d3f",
                     "number" : "0x01",
                     "parentHash" : "0x00d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6",
                     "receiptTrie" : "0xc7e418a8d10c522d9ac60d1d03012cb5852135cede278d5004bcaf6ae9aa5154",
@@ -627,10 +477,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a000d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d921e191af27920ed037f493f7fbed4c10ff0f240488cf1d397de78d83d65caba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c7e418a8d10c522d9ac60d1d03012cb5852135cede278d5004bcaf6ae9aa5154b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cd8203e880a05de063ee4552e19328d55b1f7e9feb2388c726c4e93b3c689f0723b2b0dbc9b788d22d9d1a45574732f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a000d0363b92bd7d86d9ae5bf82353dc0635741f006ed3e2a9efa85d710c977be6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d921e191af27920ed037f493f7fbed4c10ff0f240488cf1d397de78d83d65caba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c7e418a8d10c522d9ac60d1d03012cb5852135cede278d5004bcaf6ae9aa5154b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cd8203e880a072fa867eb352864bed935f8523d416058f12edb4d497f03a01c5cdd996eb8ad388d269e3c9f7ef8d3ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -664,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0485a6f52025c76f783a581db3d094fad582aaa62f21d5741d175452b81a67dd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3aa9ea4c2817a6f7e84b5b90b355c0ec4fe1e09e62e5cc52f9baebae4855c1c1",
+        "lastblockhash" : "0x3c90020397859fa96915e2bd8ad4d5097716d795e9364b73bbd4b9b462f659f8",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2_d0g0v0.json
index 3b4986581..57c25cef3 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_OOGMAfter_2_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "f7822b9ba0f6d3f4c15da496d18b83c20e0cfa601732d300653a63a5d002dff2"
+            "sourceHash" : "c55a9d7deb86f9d580ff9cb229826960611362192d27305fe691645a70f70939"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015602",
-                    "hash" : "0x367a3730facc3cc7425d5176ce0c41f5f426182c73a227fdbb97dfff6a3fe757",
-                    "mixHash" : "0x9209f0be1bdff76c6fb96ecd9f52cef888524bb428c6f5da0070a0a5e73b055b",
-                    "nonce" : "0x55ba3cc7789e9f2c",
+                    "hash" : "0xc132c6e3424196f9c7960057384c9f474932338e89c8405504044b810a4afdc4",
+                    "mixHash" : "0x7adcf6b7c58e870e5d7a9dab4420a4b758815806f9433e86aa04a9847de61d8b",
+                    "nonce" : "0x4325ce5f523570dd",
                     "number" : "0x01",
                     "parentHash" : "0x354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12",
                     "receiptTrie" : "0x02959d9bc264a46eaf807babe155ad9a49dafa3ec0af02bc1d0e97a52084baa3",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b69b9208aea462f331c55ec45f666b9b677216802fba91810536e398704e8d0a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea002959d9bc264a46eaf807babe155ad9a49dafa3ec0af02bc1d0e97a52084baa3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156028203e880a09209f0be1bdff76c6fb96ecd9f52cef888524bb428c6f5da0070a0a5e73b055b8855ba3cc7789e9f2cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b69b9208aea462f331c55ec45f666b9b677216802fba91810536e398704e8d0a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea002959d9bc264a46eaf807babe155ad9a49dafa3ec0af02bc1d0e97a52084baa3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156028203e880a07adcf6b7c58e870e5d7a9dab4420a4b758815806f9433e86aa04a9847de61d8b884325ce5f523570ddf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0292b6b5db83743e8ec7294ba6eaeddd7fa0f0142738c27415d1b714e0e61f9a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x367a3730facc3cc7425d5176ce0c41f5f426182c73a227fdbb97dfff6a3fe757",
+        "lastblockhash" : "0xc132c6e3424196f9c7960057384c9f474932338e89c8405504044b810a4afdc4",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -152,10 +152,10 @@
     "callcallcallcode_001_OOGMAfter_2_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "f7822b9ba0f6d3f4c15da496d18b83c20e0cfa601732d300653a63a5d002dff2"
+            "sourceHash" : "c55a9d7deb86f9d580ff9cb229826960611362192d27305fe691645a70f70939"
         },
         "blocks" : [
             {
@@ -166,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015602",
-                    "hash" : "0x5d8cf42b231eee2a3d2804043e8807d1c07c2cb20f0e58f3789f4224fb5becc9",
-                    "mixHash" : "0x0efce2c8bb0ea4556c3746153e80da019280a51139b54950557b2dab2da07469",
-                    "nonce" : "0x10bf2b89df3c8333",
+                    "hash" : "0x3f88573ce1c0b723629a095a9089bb1c7c6bc03c3b536a8e3b7f52e0ab46a449",
+                    "mixHash" : "0xe8bf8839ba62200d8ad1fc5a30cae5da56437580b1b0cb5f91afe2717ea00d27",
+                    "nonce" : "0xc43538d34a76f123",
                     "number" : "0x01",
                     "parentHash" : "0x354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12",
                     "receiptTrie" : "0xddacf4e0d058547475d88db110ab97a4cb2c1086ed59a6f86c9f18476e09115f",
@@ -177,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082e9bbdb92a621c9caf0a12d02e6e92ae4dc293901e435ad6094e07b29e3ffa1a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ddacf4e0d058547475d88db110ab97a4cb2c1086ed59a6f86c9f18476e09115fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156028203e880a00efce2c8bb0ea4556c3746153e80da019280a51139b54950557b2dab2da074698810bf2b89df3c8333f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082e9bbdb92a621c9caf0a12d02e6e92ae4dc293901e435ad6094e07b29e3ffa1a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ddacf4e0d058547475d88db110ab97a4cb2c1086ed59a6f86c9f18476e09115fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156028203e880a0e8bf8839ba62200d8ad1fc5a30cae5da56437580b1b0cb5f91afe2717ea00d2788c43538d34a76f123f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -214,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0292b6b5db83743e8ec7294ba6eaeddd7fa0f0142738c27415d1b714e0e61f9a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5d8cf42b231eee2a3d2804043e8807d1c07c2cb20f0e58f3789f4224fb5becc9",
+        "lastblockhash" : "0x3f88573ce1c0b723629a095a9089bb1c7c6bc03c3b536a8e3b7f52e0ab46a449",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -299,163 +299,13 @@
             }
         }
     },
-    "callcallcallcode_001_OOGMAfter_2_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "f7822b9ba0f6d3f4c15da496d18b83c20e0cfa601732d300653a63a5d002dff2"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015602",
-                    "hash" : "0xb31c99b08347d5ed833b462761e529e03b3a102cf57eebf533c3a26fbd5c8a0f",
-                    "mixHash" : "0x44c95361ba39136ab2512a72791db20801df989f8176df1cbeefec1a28c1bd75",
-                    "nonce" : "0x90d0deda3ef48b14",
-                    "number" : "0x01",
-                    "parentHash" : "0x354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12",
-                    "receiptTrie" : "0xddacf4e0d058547475d88db110ab97a4cb2c1086ed59a6f86c9f18476e09115f",
-                    "stateRoot" : "0x82e9bbdb92a621c9caf0a12d02e6e92ae4dc293901e435ad6094e07b29e3ffa1",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082e9bbdb92a621c9caf0a12d02e6e92ae4dc293901e435ad6094e07b29e3ffa1a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ddacf4e0d058547475d88db110ab97a4cb2c1086ed59a6f86c9f18476e09115fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830156028203e880a044c95361ba39136ab2512a72791db20801df989f8176df1cbeefec1a28c1bd758890d0deda3ef48b14f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0xb31c99b08347d5ed833b462761e529e03b3a102cf57eebf533c3a26fbd5c8a0f",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : {
-            "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_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "f7822b9ba0f6d3f4c15da496d18b83c20e0cfa601732d300653a63a5d002dff2"
+            "sourceHash" : "c55a9d7deb86f9d580ff9cb229826960611362192d27305fe691645a70f70939"
         },
         "blocks" : [
             {
@@ -466,9 +316,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150da",
-                    "hash" : "0xd2f96f648fd2f2b471e5ce0b49468e91f9c4f270b4970235d4cdaca386dba416",
-                    "mixHash" : "0x9e1a5f4da24bfc40f52e809d38b99bcbe0fbdd8e0204b56147cf8876d9ead5d1",
-                    "nonce" : "0xf887cba809805e90",
+                    "hash" : "0x586107d5e5b2f6a6ab80ca9ae7bde6c1b5bc609bda91e8fbc6579c790005bfc5",
+                    "mixHash" : "0x830a7b18650bce70a6c2daf0d3833d047dbcf4ae585f136de1ed2a60919d5b23",
+                    "nonce" : "0x774cdb5118ad08a3",
                     "number" : "0x01",
                     "parentHash" : "0x354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12",
                     "receiptTrie" : "0x8d06d77bff9c251dfbd24e7c2e2977f3fafd99c72cf35cf61d262cf6757f25d6",
@@ -477,10 +327,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca6ddbbcb27a24b5340051e1924d7ec759c2a0bc94970f6bd6539c17b7c44b66a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08d06d77bff9c251dfbd24e7c2e2977f3fafd99c72cf35cf61d262cf6757f25d6b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150da8203e880a09e1a5f4da24bfc40f52e809d38b99bcbe0fbdd8e0204b56147cf8876d9ead5d188f887cba809805e90f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ca6ddbbcb27a24b5340051e1924d7ec759c2a0bc94970f6bd6539c17b7c44b66a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08d06d77bff9c251dfbd24e7c2e2977f3fafd99c72cf35cf61d262cf6757f25d6b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150da8203e880a0830a7b18650bce70a6c2daf0d3833d047dbcf4ae585f136de1ed2a60919d5b2388774cdb5118ad08a3f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -514,7 +364,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0292b6b5db83743e8ec7294ba6eaeddd7fa0f0142738c27415d1b714e0e61f9a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd2f96f648fd2f2b471e5ce0b49468e91f9c4f270b4970235d4cdaca386dba416",
+        "lastblockhash" : "0x586107d5e5b2f6a6ab80ca9ae7bde6c1b5bc609bda91e8fbc6579c790005bfc5",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -602,10 +452,10 @@
     "callcallcallcode_001_OOGMAfter_2_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "f7822b9ba0f6d3f4c15da496d18b83c20e0cfa601732d300653a63a5d002dff2"
+            "sourceHash" : "c55a9d7deb86f9d580ff9cb229826960611362192d27305fe691645a70f70939"
         },
         "blocks" : [
             {
@@ -616,9 +466,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0x3ee9efc0e0ccd1e6cc4b32e6585d4ec6137cbc189d4a7798457793f04760a6eb",
-                    "mixHash" : "0xafe9ea9dc2432cea7c9e5db9b0ee535804b2bae9c2a30893b73c76ad50d4a3ef",
-                    "nonce" : "0x9c16b2dddd29884c",
+                    "hash" : "0x5fe71108246910352ed447cf828a8a1e1ae4355f504a300e0010d03f24c02158",
+                    "mixHash" : "0x702d7e7ece456d9463875328e26afd12094fbb3db7b6fec1c4398487ef8e549d",
+                    "nonce" : "0x5259b4d1837c8347",
                     "number" : "0x01",
                     "parentHash" : "0x354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12",
                     "receiptTrie" : "0xabcff8dd9e67d55de49338d5a22960752969d45486b541c566ed690881c81858",
@@ -627,10 +477,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f33001e8cb8fc14a1e8551d182d41306c44b220f18e274cf99bc187e5f96c686a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0abcff8dd9e67d55de49338d5a22960752969d45486b541c566ed690881c81858b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0afe9ea9dc2432cea7c9e5db9b0ee535804b2bae9c2a30893b73c76ad50d4a3ef889c16b2dddd29884cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0354f52e09a2c324bfcbf96e4172c75004ac3192fe2c816391c6bbfc559663c12a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f33001e8cb8fc14a1e8551d182d41306c44b220f18e274cf99bc187e5f96c686a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0abcff8dd9e67d55de49338d5a22960752969d45486b541c566ed690881c81858b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0702d7e7ece456d9463875328e26afd12094fbb3db7b6fec1c4398487ef8e549d885259b4d1837c8347f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -664,7 +514,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0292b6b5db83743e8ec7294ba6eaeddd7fa0f0142738c27415d1b714e0e61f9a2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3ee9efc0e0ccd1e6cc4b32e6585d4ec6137cbc189d4a7798457793f04760a6eb",
+        "lastblockhash" : "0x5fe71108246910352ed447cf828a8a1e1ae4355f504a300e0010d03f24c02158",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3_d0g0v0.json
index 327d7dd5e..6d85ba415 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_OOGMAfter_3_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "054eb59a2f02b85b07200956a00607fb43d5ad548a1436dfa601d3d8fba3df9f"
+            "sourceHash" : "6077a07b190d73e8aa5d5a7476dd7567e8d7ad6c41fb2357855882773dfa6a25"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0x6458b4c5ac34ecde736c3bf1a0d896a600225d7ceb5d725ea2b3ca9d2a99d0b5",
-                    "mixHash" : "0xc61bdf64404f6f61f6e9ecc62d187c24e08275653e3d2133aa08f4ebe42c5987",
-                    "nonce" : "0x5e25c59c88aae72a",
+                    "hash" : "0x8b5532586f23f3fdf379efc900eb88cfbcbe6f64bd0ac32fc5a606e428b761b4",
+                    "mixHash" : "0x9c658036126bbbe79c0df0e53828b3b1026d21dd029f46ba45c7feffc38f33be",
+                    "nonce" : "0xa7b9333bb2b46fcb",
                     "number" : "0x01",
                     "parentHash" : "0x28923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebf",
                     "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a028923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a4d5ea4c2de873327ea6cd5df984ccf0385dc05372d48fa7a28f293a1c944c79a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0c61bdf64404f6f61f6e9ecc62d187c24e08275653e3d2133aa08f4ebe42c5987885e25c59c88aae72af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a028923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a4d5ea4c2de873327ea6cd5df984ccf0385dc05372d48fa7a28f293a1c944c79a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a09c658036126bbbe79c0df0e53828b3b1026d21dd029f46ba45c7feffc38f33be88a7b9333bb2b46fcbf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6458b4c5ac34ecde736c3bf1a0d896a600225d7ceb5d725ea2b3ca9d2a99d0b5",
+        "lastblockhash" : "0x8b5532586f23f3fdf379efc900eb88cfbcbe6f64bd0ac32fc5a606e428b761b4",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -152,10 +152,10 @@
     "callcallcallcode_001_OOGMAfter_3_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "054eb59a2f02b85b07200956a00607fb43d5ad548a1436dfa601d3d8fba3df9f"
+            "sourceHash" : "6077a07b190d73e8aa5d5a7476dd7567e8d7ad6c41fb2357855882773dfa6a25"
         },
         "blocks" : [
             {
@@ -166,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0xa92dd2708cfa52a6b9bd9c8a222a1f34e695f802c211ead8feb8079a37f65e4f",
-                    "mixHash" : "0x7d23538db235311f55d89dc323787bb482969fbf97bb571ddc19f9285d1dc364",
-                    "nonce" : "0x8b58d33491caf5e7",
+                    "hash" : "0x53509744190413be5d27aebd4136d1a7fbfad8caad60324dc06f128ecd71119e",
+                    "mixHash" : "0x8fde316ea7961f0cad9b35fc7dcac852de00a7307239f77e6899a16eeac35bdb",
+                    "nonce" : "0x8ecef354c0a756b8",
                     "number" : "0x01",
                     "parentHash" : "0x28923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebf",
                     "receiptTrie" : "0x5940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5",
@@ -177,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a028923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0430c4119c8e2d6becc7ac4f5a28b8c13bd022fb7a7091d06e677320c7147e52da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a07d23538db235311f55d89dc323787bb482969fbf97bb571ddc19f9285d1dc364888b58d33491caf5e7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a028923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0430c4119c8e2d6becc7ac4f5a28b8c13bd022fb7a7091d06e677320c7147e52da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a08fde316ea7961f0cad9b35fc7dcac852de00a7307239f77e6899a16eeac35bdb888ecef354c0a756b8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -214,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa92dd2708cfa52a6b9bd9c8a222a1f34e695f802c211ead8feb8079a37f65e4f",
+        "lastblockhash" : "0x53509744190413be5d27aebd4136d1a7fbfad8caad60324dc06f128ecd71119e",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -299,312 +299,13 @@
             }
         }
     },
-    "callcallcallcode_001_OOGMAfter_3_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "054eb59a2f02b85b07200956a00607fb43d5ad548a1436dfa601d3d8fba3df9f"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0155fd",
-                    "hash" : "0x0aafae312a6a1be8f892adca3af30bfd5baad4c50421519bee69dae514a784aa",
-                    "mixHash" : "0xe08b7461bc901c4fabff09c0716135baaca895bfe9d866dfff21da4d0236f722",
-                    "nonce" : "0xcbd3a38ee38a53ae",
-                    "number" : "0x01",
-                    "parentHash" : "0x28923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebf",
-                    "receiptTrie" : "0x5940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5",
-                    "stateRoot" : "0x430c4119c8e2d6becc7ac4f5a28b8c13bd022fb7a7091d06e677320c7147e52d",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a028923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0430c4119c8e2d6becc7ac4f5a28b8c13bd022fb7a7091d06e677320c7147e52da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05940a6313b47bb5e4fa2ab496b5441ed08ba9166e94c0ea68ecb7f3943165be5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0e08b7461bc901c4fabff09c0716135baaca895bfe9d866dfff21da4d0236f72288cbd3a38ee38a53aef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x0aafae312a6a1be8f892adca3af30bfd5baad4c50421519bee69dae514a784aa",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : {
-            "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_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "054eb59a2f02b85b07200956a00607fb43d5ad548a1436dfa601d3d8fba3df9f"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0150cc",
-                    "hash" : "0xe726c5a361f606c40b6fc178a67f4e32dbdef0ab9caf97c7598e8e7df6ceb601",
-                    "mixHash" : "0xd340a3313bb927764ed1be5e131d1b52a1dad02b2496ca9f16941ea52581be20",
-                    "nonce" : "0x32b749c21e900035",
-                    "number" : "0x01",
-                    "parentHash" : "0x28923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebf",
-                    "receiptTrie" : "0x5d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7",
-                    "stateRoot" : "0xdc6f9f117d822962d2fb341b86fd1eae4c359d6b947d7263e7991363cfff32e3",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a028923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc6f9f117d822962d2fb341b86fd1eae4c359d6b947d7263e7991363cfff32e3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0d340a3313bb927764ed1be5e131d1b52a1dad02b2496ca9f16941ea52581be208832b749c21e900035f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0xe726c5a361f606c40b6fc178a67f4e32dbdef0ab9caf97c7598e8e7df6ceb601",
-        "network" : "Frontier",
-        "postState" : {
-            "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" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550cc",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af34",
-                "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_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "054eb59a2f02b85b07200956a00607fb43d5ad548a1436dfa601d3d8fba3df9f"
+            "sourceHash" : "6077a07b190d73e8aa5d5a7476dd7567e8d7ad6c41fb2357855882773dfa6a25"
         },
         "blocks" : [
             {
@@ -615,9 +316,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0xdc3e17aca22406949ace75f9f6263797ed165561b25c4ca67ad2b46ec66650e0",
-                    "mixHash" : "0xf6db7f8ed2a1beafdb68855e383229c0e9f13ee09bc7013db964be033be1ccf9",
-                    "nonce" : "0x3b50ecbb8670acb7",
+                    "hash" : "0xc20fd31df8713493e409f0f2ffb8bef7b2d91eecbc2e7af3e24383117b1047bf",
+                    "mixHash" : "0xca73f71cf035eb9f5dc3848fa3a44b00f84fdbd2438c2df37fee42c537aa8d90",
+                    "nonce" : "0x5f1e0a28435ea4aa",
                     "number" : "0x01",
                     "parentHash" : "0x28923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebf",
                     "receiptTrie" : "0x5d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7",
@@ -626,10 +327,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a028923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc6f9f117d822962d2fb341b86fd1eae4c359d6b947d7263e7991363cfff32e3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0f6db7f8ed2a1beafdb68855e383229c0e9f13ee09bc7013db964be033be1ccf9883b50ecbb8670acb7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a028923ccc85e376c44c4333061caf34afbaaaa612c7def1a348b91c1b46b64ebfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc6f9f117d822962d2fb341b86fd1eae4c359d6b947d7263e7991363cfff32e3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05d865c5b1a89c33ea94bbd869f9f07459a51a5539abd0bb32c0071afe0db9de7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0ca73f71cf035eb9f5dc3848fa3a44b00f84fdbd2438c2df37fee42c537aa8d90885f1e0a28435ea4aaf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -663,7 +364,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0acfee91e450a4079d436541563f48b97053c88a7a2dfedb8abf26f4ab40912a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdc3e17aca22406949ace75f9f6263797ed165561b25c4ca67ad2b46ec66650e0",
+        "lastblockhash" : "0xc20fd31df8713493e409f0f2ffb8bef7b2d91eecbc2e7af3e24383117b1047bf",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1_d0g0v0.json
index d9b84930a..624c4cdf9 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_OOGMAfter_1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "49e7424c3fa97de836d79baa036419a76f494bcdf1ff0e67306c3c47986c7f99"
+            "sourceHash" : "8448203c95ddda561ebb236593f535e18071b06fcacc112b7f0226b29a8badd8"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155f7",
-                    "hash" : "0xa2458d11c1ba4be861f42d4b23deb3f5beb8a1be912497ed0e1a2a6d3363c6a1",
-                    "mixHash" : "0x85a6f018871de5f97454e0d386cbaf9efa1f86976e070504dc5a0928597eb4e6",
-                    "nonce" : "0x3819d13935a4c59d",
+                    "hash" : "0xa75e94a7d33f52ff837e9447b5e3bec630e7a33641a54d8f10103db80e7dc4e2",
+                    "mixHash" : "0x420ea15dc0eee9552f5420c4fc2c514f4a2c1523b729f4ef1bae0886f0d09ddf",
+                    "nonce" : "0x9bc47ba6a894fc4b",
                     "number" : "0x01",
                     "parentHash" : "0x49c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954",
                     "receiptTrie" : "0x7b32f6865ba11d16b4c8e757d35f80e1ea3ddb33d2b2fc644a01c5a2bbb5ba1f",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a049c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02aac97c679b6383d0500ea96213b1800edec3725c51369e049dc11c161242b4ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07b32f6865ba11d16b4c8e757d35f80e1ea3ddb33d2b2fc644a01c5a2bbb5ba1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a085a6f018871de5f97454e0d386cbaf9efa1f86976e070504dc5a0928597eb4e6883819d13935a4c59df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a049c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02aac97c679b6383d0500ea96213b1800edec3725c51369e049dc11c161242b4ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07b32f6865ba11d16b4c8e757d35f80e1ea3ddb33d2b2fc644a01c5a2bbb5ba1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a0420ea15dc0eee9552f5420c4fc2c514f4a2c1523b729f4ef1bae0886f0d09ddf889bc47ba6a894fc4bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01da92cef5f52af69c159d1a836ce44a8f6a7b7a4313e25f0a30c9884f52844b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa2458d11c1ba4be861f42d4b23deb3f5beb8a1be912497ed0e1a2a6d3363c6a1",
+        "lastblockhash" : "0xa75e94a7d33f52ff837e9447b5e3bec630e7a33641a54d8f10103db80e7dc4e2",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -152,10 +152,10 @@
     "callcallcodecall_010_OOGMAfter_1_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "49e7424c3fa97de836d79baa036419a76f494bcdf1ff0e67306c3c47986c7f99"
+            "sourceHash" : "8448203c95ddda561ebb236593f535e18071b06fcacc112b7f0226b29a8badd8"
         },
         "blocks" : [
             {
@@ -166,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155f7",
-                    "hash" : "0xfd945dde6d5047c97821966f67611039eb884b79524cde1ac7ce50e3bed95b70",
-                    "mixHash" : "0x33e19f74b59fb2957a5f381907a4930e967fda1f17a2789cec273c6d1179eccc",
-                    "nonce" : "0x0a1d9fe329c468fd",
+                    "hash" : "0x45f3a9ef57619d47e38ce9f919b317132d4667a92f5156d85c5359f7bec4f660",
+                    "mixHash" : "0xffd664c9e25508c07de78105c539ca995552ff66e602a25ba80b6bb5467d7940",
+                    "nonce" : "0x3cdd6233c217a59f",
                     "number" : "0x01",
                     "parentHash" : "0x49c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954",
                     "receiptTrie" : "0x78de38a1cc5bc070882d75997e6524adaf261e428663c3ddd46b2518cec5fd84",
@@ -177,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a049c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a95688229630019b545de2594ae92848cee2ece44c560b8a8982a050bd34e7a1a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea078de38a1cc5bc070882d75997e6524adaf261e428663c3ddd46b2518cec5fd84b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a033e19f74b59fb2957a5f381907a4930e967fda1f17a2789cec273c6d1179eccc880a1d9fe329c468fdf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a049c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a95688229630019b545de2594ae92848cee2ece44c560b8a8982a050bd34e7a1a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea078de38a1cc5bc070882d75997e6524adaf261e428663c3ddd46b2518cec5fd84b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a0ffd664c9e25508c07de78105c539ca995552ff66e602a25ba80b6bb5467d7940883cdd6233c217a59ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -214,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01da92cef5f52af69c159d1a836ce44a8f6a7b7a4313e25f0a30c9884f52844b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfd945dde6d5047c97821966f67611039eb884b79524cde1ac7ce50e3bed95b70",
+        "lastblockhash" : "0x45f3a9ef57619d47e38ce9f919b317132d4667a92f5156d85c5359f7bec4f660",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -299,312 +299,13 @@
             }
         }
     },
-    "callcallcodecall_010_OOGMAfter_1_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "49e7424c3fa97de836d79baa036419a76f494bcdf1ff0e67306c3c47986c7f99"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0155f7",
-                    "hash" : "0x13dec03a105f3c8af944b99a35a65c5e581e097463f2acd184af40b0cc23f821",
-                    "mixHash" : "0x9586d2233b0612315d6249b3e2c396f073f1f6b0172fed90ceee7cddee0c4bd0",
-                    "nonce" : "0xeef777054e86ab9d",
-                    "number" : "0x01",
-                    "parentHash" : "0x49c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954",
-                    "receiptTrie" : "0x78de38a1cc5bc070882d75997e6524adaf261e428663c3ddd46b2518cec5fd84",
-                    "stateRoot" : "0xa95688229630019b545de2594ae92848cee2ece44c560b8a8982a050bd34e7a1",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a049c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a95688229630019b545de2594ae92848cee2ece44c560b8a8982a050bd34e7a1a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea078de38a1cc5bc070882d75997e6524adaf261e428663c3ddd46b2518cec5fd84b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a09586d2233b0612315d6249b3e2c396f073f1f6b0172fed90ceee7cddee0c4bd088eef777054e86ab9df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x13dec03a105f3c8af944b99a35a65c5e581e097463f2acd184af40b0cc23f821",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : {
-            "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_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "49e7424c3fa97de836d79baa036419a76f494bcdf1ff0e67306c3c47986c7f99"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0150cd",
-                    "hash" : "0xb98d15be2b94cedb921c8c1f0cb16e75b637a91f09eae2be92f2f686240d344a",
-                    "mixHash" : "0xd74a8c180d9ba50255de43aee2fe72f6a856360d26321199c5e8542f2d47c346",
-                    "nonce" : "0x0473b4268289ddd5",
-                    "number" : "0x01",
-                    "parentHash" : "0x49c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954",
-                    "receiptTrie" : "0x44ddc52220f9aee4b7a46e2b9211e884746bfed8b1f4c6af23d5f48c8e714be6",
-                    "stateRoot" : "0xd5def02563677036b2880a12575ce0e1cbaf250af631c9e1f792c6bea139ac0a",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a049c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5def02563677036b2880a12575ce0e1cbaf250af631c9e1f792c6bea139ac0aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea044ddc52220f9aee4b7a46e2b9211e884746bfed8b1f4c6af23d5f48c8e714be6b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cd8203e880a0d74a8c180d9ba50255de43aee2fe72f6a856360d26321199c5e8542f2d47c346880473b4268289ddd5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0xb98d15be2b94cedb921c8c1f0cb16e75b637a91f09eae2be92f2f686240d344a",
-        "network" : "Frontier",
-        "postState" : {
-            "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" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550cd",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af33",
-                "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_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "49e7424c3fa97de836d79baa036419a76f494bcdf1ff0e67306c3c47986c7f99"
+            "sourceHash" : "8448203c95ddda561ebb236593f535e18071b06fcacc112b7f0226b29a8badd8"
         },
         "blocks" : [
             {
@@ -615,9 +316,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cd",
-                    "hash" : "0x80b352b5ac489db4634dbc1f1248b41daa33fb1b3d20edbc99d8fe7606ba1a56",
-                    "mixHash" : "0x07e7048a798489c4c1761588b1b8e9952b1ffd6af55cb8bf8d3638385de4431c",
-                    "nonce" : "0x0cdcb4da842a4d0f",
+                    "hash" : "0x1c37c523a2706e3945d3282bf482d5a6a857d76a1e04fea26b61ef718e49dd47",
+                    "mixHash" : "0x7a67b8c1ab119c4aab0a7faeb52e91114bdb692489fa3bd1784f409314c3980b",
+                    "nonce" : "0xa2558939931ba594",
                     "number" : "0x01",
                     "parentHash" : "0x49c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954",
                     "receiptTrie" : "0x44ddc52220f9aee4b7a46e2b9211e884746bfed8b1f4c6af23d5f48c8e714be6",
@@ -626,10 +327,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a049c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5def02563677036b2880a12575ce0e1cbaf250af631c9e1f792c6bea139ac0aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea044ddc52220f9aee4b7a46e2b9211e884746bfed8b1f4c6af23d5f48c8e714be6b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cd8203e880a007e7048a798489c4c1761588b1b8e9952b1ffd6af55cb8bf8d3638385de4431c880cdcb4da842a4d0ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a049c3041fdd8ed1f14961ca97b1882ceb0b5b13af4ccd39c36a3a96a42ea0e954a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5def02563677036b2880a12575ce0e1cbaf250af631c9e1f792c6bea139ac0aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea044ddc52220f9aee4b7a46e2b9211e884746bfed8b1f4c6af23d5f48c8e714be6b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cd8203e880a07a67b8c1ab119c4aab0a7faeb52e91114bdb692489fa3bd1784f409314c3980b88a2558939931ba594f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -663,7 +364,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01da92cef5f52af69c159d1a836ce44a8f6a7b7a4313e25f0a30c9884f52844b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x80b352b5ac489db4634dbc1f1248b41daa33fb1b3d20edbc99d8fe7606ba1a56",
+        "lastblockhash" : "0x1c37c523a2706e3945d3282bf482d5a6a857d76a1e04fea26b61ef718e49dd47",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2_d0g0v0.json
index f4d3c2a86..cef7d854f 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_OOGMAfter_2_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "ddec6331e082afd640e86968f7b6cc9fc2ed08ca9a8f6d94da9dc7cc26b0a22f"
+            "sourceHash" : "53efd168b1e858564da95e854523476efd42c4a19090e2e14a673f13649b29f9"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fa",
-                    "hash" : "0xfadfbd040340068a3887b8bd75da176115308c8ddf0ed71178577c4d3a688482",
-                    "mixHash" : "0x7a08eb64af5f77fc548f3324751fcd5b2551866f265c4207f62b5527aa10bd7d",
-                    "nonce" : "0xdf2a878e000e46d3",
+                    "hash" : "0x9965c0478c78f4dd4d5417d8037c7c249a45ad93f1acbbdd1a5f7016a676c272",
+                    "mixHash" : "0x86c4e9917b9f3c4278acd7fd9e9fa421e270fe1564d5737b6d1b73f577c36913",
+                    "nonce" : "0xf5a1974eb49d23c4",
                     "number" : "0x01",
                     "parentHash" : "0xbdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1",
                     "receiptTrie" : "0x9c15c271a51ae8f1007b852a5c63f8adccff1dafb06f5a58921c871c65abaff9",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08314a1e9aa3f7005499b2c3b20d0156f8459c663b10a94b71e94a5449c71f4e9a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09c15c271a51ae8f1007b852a5c63f8adccff1dafb06f5a58921c871c65abaff9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a07a08eb64af5f77fc548f3324751fcd5b2551866f265c4207f62b5527aa10bd7d88df2a878e000e46d3f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0bdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08314a1e9aa3f7005499b2c3b20d0156f8459c663b10a94b71e94a5449c71f4e9a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09c15c271a51ae8f1007b852a5c63f8adccff1dafb06f5a58921c871c65abaff9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a086c4e9917b9f3c4278acd7fd9e9fa421e270fe1564d5737b6d1b73f577c3691388f5a1974eb49d23c4f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029847014ff20846c4c66e79efef3203b68ae69e0c72c0ce17e14417766d227f7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfadfbd040340068a3887b8bd75da176115308c8ddf0ed71178577c4d3a688482",
+        "lastblockhash" : "0x9965c0478c78f4dd4d5417d8037c7c249a45ad93f1acbbdd1a5f7016a676c272",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -152,10 +152,10 @@
     "callcallcodecall_010_OOGMAfter_2_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "ddec6331e082afd640e86968f7b6cc9fc2ed08ca9a8f6d94da9dc7cc26b0a22f"
+            "sourceHash" : "53efd168b1e858564da95e854523476efd42c4a19090e2e14a673f13649b29f9"
         },
         "blocks" : [
             {
@@ -166,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fa",
-                    "hash" : "0x9f0d32e8177d9a103d980279c3cdec8ce0e8cbfcd20b2e985ada32ab8525b428",
-                    "mixHash" : "0x17fe4b96e20b2d236e8ddcf14dfc42123db35df0dadadf15f68bf4ff44d4f96f",
-                    "nonce" : "0x65db1cae75b96bea",
+                    "hash" : "0xa00abb19104e04d3ac2d7c5334342fc95260b947955fbb000d95429714630008",
+                    "mixHash" : "0xb577247f69e229bb079bf8cdc04dca1b42d9701c56b8a9124d068318b89a27fd",
+                    "nonce" : "0x8c3ebbfbc60e4777",
                     "number" : "0x01",
                     "parentHash" : "0xbdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1",
                     "receiptTrie" : "0xbd7e197e7c7b7a4151fb5cd1489db68e3588f8ad2385eebec6c1969ae1135167",
@@ -177,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ebbbc3894ac249db61ccff3928947f432ce0c708113d34c31af26c9d9d5d0ac8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0bd7e197e7c7b7a4151fb5cd1489db68e3588f8ad2385eebec6c1969ae1135167b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a017fe4b96e20b2d236e8ddcf14dfc42123db35df0dadadf15f68bf4ff44d4f96f8865db1cae75b96beaf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0bdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ebbbc3894ac249db61ccff3928947f432ce0c708113d34c31af26c9d9d5d0ac8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0bd7e197e7c7b7a4151fb5cd1489db68e3588f8ad2385eebec6c1969ae1135167b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a0b577247f69e229bb079bf8cdc04dca1b42d9701c56b8a9124d068318b89a27fd888c3ebbfbc60e4777f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -214,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029847014ff20846c4c66e79efef3203b68ae69e0c72c0ce17e14417766d227f7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9f0d32e8177d9a103d980279c3cdec8ce0e8cbfcd20b2e985ada32ab8525b428",
+        "lastblockhash" : "0xa00abb19104e04d3ac2d7c5334342fc95260b947955fbb000d95429714630008",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -299,312 +299,13 @@
             }
         }
     },
-    "callcallcodecall_010_OOGMAfter_2_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "ddec6331e082afd640e86968f7b6cc9fc2ed08ca9a8f6d94da9dc7cc26b0a22f"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0155fa",
-                    "hash" : "0x908565e677f3ca3eef19cce1157213577cd9ee14d167b2952c62eb7a839a36b7",
-                    "mixHash" : "0xd2229dcf76889c19102d155162815726b5ea0365d22a258b46e4231b9b53298f",
-                    "nonce" : "0x157c2bb6a7990744",
-                    "number" : "0x01",
-                    "parentHash" : "0xbdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1",
-                    "receiptTrie" : "0xbd7e197e7c7b7a4151fb5cd1489db68e3588f8ad2385eebec6c1969ae1135167",
-                    "stateRoot" : "0xebbbc3894ac249db61ccff3928947f432ce0c708113d34c31af26c9d9d5d0ac8",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0bdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ebbbc3894ac249db61ccff3928947f432ce0c708113d34c31af26c9d9d5d0ac8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0bd7e197e7c7b7a4151fb5cd1489db68e3588f8ad2385eebec6c1969ae1135167b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a0d2229dcf76889c19102d155162815726b5ea0365d22a258b46e4231b9b53298f88157c2bb6a7990744f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x908565e677f3ca3eef19cce1157213577cd9ee14d167b2952c62eb7a839a36b7",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : {
-            "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_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "ddec6331e082afd640e86968f7b6cc9fc2ed08ca9a8f6d94da9dc7cc26b0a22f"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0150cc",
-                    "hash" : "0x1d6e3f668d40e5b3ae032ea0e995fe080bf6f4ed12f9652ebc99faaf7e95bff3",
-                    "mixHash" : "0x974b0d06d32897e188069f6a75638f086cda8548484a9bac51b10ed640c6a914",
-                    "nonce" : "0x830dc7e775d0f447",
-                    "number" : "0x01",
-                    "parentHash" : "0xbdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1",
-                    "receiptTrie" : "0x553904f2b8cb6646c17757546024e0702f9a6a9c91e390fa3542ceed6b7c9b48",
-                    "stateRoot" : "0xb8f0f735f1f064b58dad849bdb74e2c2a8037285d2434905dfaad343a16902a9",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0bdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8f0f735f1f064b58dad849bdb74e2c2a8037285d2434905dfaad343a16902a9a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0553904f2b8cb6646c17757546024e0702f9a6a9c91e390fa3542ceed6b7c9b48b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0974b0d06d32897e188069f6a75638f086cda8548484a9bac51b10ed640c6a91488830dc7e775d0f447f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x1d6e3f668d40e5b3ae032ea0e995fe080bf6f4ed12f9652ebc99faaf7e95bff3",
-        "network" : "Frontier",
-        "postState" : {
-            "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" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550cc",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af34",
-                "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_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "ddec6331e082afd640e86968f7b6cc9fc2ed08ca9a8f6d94da9dc7cc26b0a22f"
+            "sourceHash" : "53efd168b1e858564da95e854523476efd42c4a19090e2e14a673f13649b29f9"
         },
         "blocks" : [
             {
@@ -615,9 +316,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0x3813e844df35211e2244ff2aa85047e2d4012b9a2b72427a6fb61492ad1e0f62",
-                    "mixHash" : "0x16cdd51a5d1ea8a7c37721d76925d62d9b41cc26b46a7364a358e83c44427aa8",
-                    "nonce" : "0xf7198bc2147b3f2a",
+                    "hash" : "0x676a80bbc296c380f854823b564467c42e9c07df022f43d830809d9b36632bd9",
+                    "mixHash" : "0xad40dac4cae03e23b1f7d0757e7067e22db180f6f1f3bc0f0ed6d7815ac847b5",
+                    "nonce" : "0xaf9f5547afe10c9e",
                     "number" : "0x01",
                     "parentHash" : "0xbdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1",
                     "receiptTrie" : "0x553904f2b8cb6646c17757546024e0702f9a6a9c91e390fa3542ceed6b7c9b48",
@@ -626,10 +327,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8f0f735f1f064b58dad849bdb74e2c2a8037285d2434905dfaad343a16902a9a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0553904f2b8cb6646c17757546024e0702f9a6a9c91e390fa3542ceed6b7c9b48b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a016cdd51a5d1ea8a7c37721d76925d62d9b41cc26b46a7364a358e83c44427aa888f7198bc2147b3f2af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0bdc6a9bb15607324fcdf70642a01eac4fc69d446d84e8a9f60e76fc529877fa1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8f0f735f1f064b58dad849bdb74e2c2a8037285d2434905dfaad343a16902a9a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0553904f2b8cb6646c17757546024e0702f9a6a9c91e390fa3542ceed6b7c9b48b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0ad40dac4cae03e23b1f7d0757e7067e22db180f6f1f3bc0f0ed6d7815ac847b588af9f5547afe10c9ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -663,7 +364,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029847014ff20846c4c66e79efef3203b68ae69e0c72c0ce17e14417766d227f7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3813e844df35211e2244ff2aa85047e2d4012b9a2b72427a6fb61492ad1e0f62",
+        "lastblockhash" : "0x676a80bbc296c380f854823b564467c42e9c07df022f43d830809d9b36632bd9",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3_d0g0v0.json
index cc07a7dc3..4005d9559 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_OOGMAfter_3_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "af13d174c772a822050cc67ef3c6dcf24d8cccb7071247557a705cf0874d49fe"
+            "sourceHash" : "429a4b2c2f49cce1db1a2184b6f883f0cb577b992c4a8e3c072b099c76aa7252"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0xc219e07aa85e50a00a227438bba9795a335e7f3b12a5f5b23089a4fc595eef59",
-                    "mixHash" : "0x1e8cb3cf85c9aa048edc47fefbed05e33c94918778149a527b10ccb0a2c1ad58",
-                    "nonce" : "0xe4b22d00ab8ec1ca",
+                    "hash" : "0x15d5cda2ffd46b60e5eddf322533291e6bd180f441b2519c01fc3029028e1c96",
+                    "mixHash" : "0xdc7321fd8c0f33709eca1aa1ca8e422916746a4e06892d61d7cb015b1f0df925",
+                    "nonce" : "0xe48ee35cbfcd6878",
                     "number" : "0x01",
                     "parentHash" : "0x82f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75",
                     "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a082f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ca9364ce023fee7a6c14068bc9a52c7ffb6a03dc5e725e2508b55f3f8e5a7f5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a01e8cb3cf85c9aa048edc47fefbed05e33c94918778149a527b10ccb0a2c1ad5888e4b22d00ab8ec1caf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a082f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04ca9364ce023fee7a6c14068bc9a52c7ffb6a03dc5e725e2508b55f3f8e5a7f5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0dc7321fd8c0f33709eca1aa1ca8e422916746a4e06892d61d7cb015b1f0df92588e48ee35cbfcd6878f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc219e07aa85e50a00a227438bba9795a335e7f3b12a5f5b23089a4fc595eef59",
+        "lastblockhash" : "0x15d5cda2ffd46b60e5eddf322533291e6bd180f441b2519c01fc3029028e1c96",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -152,10 +152,10 @@
     "callcallcodecall_010_OOGMAfter_3_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "af13d174c772a822050cc67ef3c6dcf24d8cccb7071247557a705cf0874d49fe"
+            "sourceHash" : "429a4b2c2f49cce1db1a2184b6f883f0cb577b992c4a8e3c072b099c76aa7252"
         },
         "blocks" : [
             {
@@ -166,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0xfd6d25d2ea0114b3452234d103338388d3c293318719483089013cab25822edf",
-                    "mixHash" : "0xb948211e3ed4024f27c54e133a0d3556f1113ec1b5da6775ae4b4f8dbf708510",
-                    "nonce" : "0x4708ef6b6bb86595",
+                    "hash" : "0xd5430cb2bdd9f9487ff3e5b5e9b70e38f4dde1a910693cb6b844ae53c8a61058",
+                    "mixHash" : "0xecd66ec18a30b7d964efd2b01c682a7cac465777d814b076cc62af7e5f6e2b1f",
+                    "nonce" : "0x5e6e3ce8c63369c0",
                     "number" : "0x01",
                     "parentHash" : "0x82f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75",
                     "receiptTrie" : "0xc4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882",
@@ -177,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a082f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0830d27f797a440c9b2c72b9409662e71e3ed9e4f565e40b802b86445e3b3f7caa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0b948211e3ed4024f27c54e133a0d3556f1113ec1b5da6775ae4b4f8dbf708510884708ef6b6bb86595f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a082f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0830d27f797a440c9b2c72b9409662e71e3ed9e4f565e40b802b86445e3b3f7caa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0ecd66ec18a30b7d964efd2b01c682a7cac465777d814b076cc62af7e5f6e2b1f885e6e3ce8c63369c0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -214,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfd6d25d2ea0114b3452234d103338388d3c293318719483089013cab25822edf",
+        "lastblockhash" : "0xd5430cb2bdd9f9487ff3e5b5e9b70e38f4dde1a910693cb6b844ae53c8a61058",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -299,312 +299,13 @@
             }
         }
     },
-    "callcallcodecall_010_OOGMAfter_3_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "af13d174c772a822050cc67ef3c6dcf24d8cccb7071247557a705cf0874d49fe"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0155fd",
-                    "hash" : "0xe39d3923c6d7731efa12fbc31e7adb40fbdda42f592f0d30de9033e6491ce6f0",
-                    "mixHash" : "0xd32850af1d2e14fa4adb5da0b6b2f6d614fa3ac39d4e0709bf79b3230659237b",
-                    "nonce" : "0x21ab157145a0b697",
-                    "number" : "0x01",
-                    "parentHash" : "0x82f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75",
-                    "receiptTrie" : "0xc4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882",
-                    "stateRoot" : "0x830d27f797a440c9b2c72b9409662e71e3ed9e4f565e40b802b86445e3b3f7ca",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a082f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0830d27f797a440c9b2c72b9409662e71e3ed9e4f565e40b802b86445e3b3f7caa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c4a8c9cb4fdbd2dccac3e08e4fa28a9c9d8e1ed8fba08e67ab578c8feba01882b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0d32850af1d2e14fa4adb5da0b6b2f6d614fa3ac39d4e0709bf79b3230659237b8821ab157145a0b697f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0xe39d3923c6d7731efa12fbc31e7adb40fbdda42f592f0d30de9033e6491ce6f0",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : {
-            "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_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "af13d174c772a822050cc67ef3c6dcf24d8cccb7071247557a705cf0874d49fe"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0150cc",
-                    "hash" : "0x4347eb0e22ea30c4add0108518216786b8d64d9dbae9a4a88019522ee2230b2f",
-                    "mixHash" : "0x2d5bf97f93ce32c7e7d1539d4ae96c65b26a375cd01986902900d8efcc07d452",
-                    "nonce" : "0xfe428e33ce2396ba",
-                    "number" : "0x01",
-                    "parentHash" : "0x82f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75",
-                    "receiptTrie" : "0x8894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189",
-                    "stateRoot" : "0xedf9c6b0f9ebfb3d85af1dacbecab6d70bd5bec19c30e95ec2de1acb3ff82602",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a082f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edf9c6b0f9ebfb3d85af1dacbecab6d70bd5bec19c30e95ec2de1acb3ff82602a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a02d5bf97f93ce32c7e7d1539d4ae96c65b26a375cd01986902900d8efcc07d45288fe428e33ce2396baf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x4347eb0e22ea30c4add0108518216786b8d64d9dbae9a4a88019522ee2230b2f",
-        "network" : "Frontier",
-        "postState" : {
-            "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" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550cc",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af34",
-                "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_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "af13d174c772a822050cc67ef3c6dcf24d8cccb7071247557a705cf0874d49fe"
+            "sourceHash" : "429a4b2c2f49cce1db1a2184b6f883f0cb577b992c4a8e3c072b099c76aa7252"
         },
         "blocks" : [
             {
@@ -615,9 +316,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0x36f3431f1686d0001c07b13f17d8bcd61643bc1ba0ec4efd2a8f94cc8b334cae",
-                    "mixHash" : "0xe8d642181b12f76f706feca82f6fa1802eb14eb70da0004140295704584d659d",
-                    "nonce" : "0x45932767da71e930",
+                    "hash" : "0x5bada73fbe36df71bbf58b14fb758db95d430a3fe2d60c2a68e5cacc9d692b57",
+                    "mixHash" : "0xd01a175bb7edf09744593dcfd8d2c28793429f369d36cb76622f840871ad0bd5",
+                    "nonce" : "0x9d013e35c3d74018",
                     "number" : "0x01",
                     "parentHash" : "0x82f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75",
                     "receiptTrie" : "0x8894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189",
@@ -626,10 +327,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a082f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edf9c6b0f9ebfb3d85af1dacbecab6d70bd5bec19c30e95ec2de1acb3ff82602a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0e8d642181b12f76f706feca82f6fa1802eb14eb70da0004140295704584d659d8845932767da71e930f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a082f4f7b85fc156834ab67e54ba72e434bb004f08bbb8b1f10dbdf1f914ccce75a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edf9c6b0f9ebfb3d85af1dacbecab6d70bd5bec19c30e95ec2de1acb3ff82602a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08894ddead25bc52f387e0ed4fc0eb6c1ba766d313d8d5616d8125d74deb6e189b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0d01a175bb7edf09744593dcfd8d2c28793429f369d36cb76622f840871ad0bd5889d013e35c3d74018f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -663,7 +364,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0b469eea99deedf0299b3e4a3b44875fcffedb4c032e3dee01c2772538f7a4ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x36f3431f1686d0001c07b13f17d8bcd61643bc1ba0ec4efd2a8f94cc8b334cae",
+        "lastblockhash" : "0x5bada73fbe36df71bbf58b14fb758db95d430a3fe2d60c2a68e5cacc9d692b57",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1_d0g0v0.json
index 789cf14bc..669872d28 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_OOGMAfter_1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "21ea3c6a05b1688f0fbdc4023fbab580566962adda7243e25ce987fa3a2e214d"
+            "sourceHash" : "eababfb7b09ab944ea07f2999c018b1ca4c7922a3dbaddd9c8be3e672cc9710b"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fa",
-                    "hash" : "0x94e3c27cc7ec15954f06001c844140e3f9469091b7c549c2080140ef28cedd98",
-                    "mixHash" : "0x477ae4432cc26cbe5a884eb5d9f82e9fa99b87c35f48535ac515e7a80480334e",
-                    "nonce" : "0x0c596fa1dc8880d6",
+                    "hash" : "0x5900a8693a14b13cc8c2a3a640bc1ad410fac3ef39fc9cb542ee5a5f65689f08",
+                    "mixHash" : "0x317812a09e09abd21a3b205bdaffef3e966cbf83a9b34b66f6d89b072899f5a4",
+                    "nonce" : "0x5b75b1cf270b1693",
                     "number" : "0x01",
                     "parentHash" : "0x699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94",
                     "receiptTrie" : "0x9c15c271a51ae8f1007b852a5c63f8adccff1dafb06f5a58921c871c65abaff9",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082046e38989a7a024e457606f3b2a607b983ec36a807e952742c53dc48f9a809a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09c15c271a51ae8f1007b852a5c63f8adccff1dafb06f5a58921c871c65abaff9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a0477ae4432cc26cbe5a884eb5d9f82e9fa99b87c35f48535ac515e7a80480334e880c596fa1dc8880d6f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082046e38989a7a024e457606f3b2a607b983ec36a807e952742c53dc48f9a809a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09c15c271a51ae8f1007b852a5c63f8adccff1dafb06f5a58921c871c65abaff9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a0317812a09e09abd21a3b205bdaffef3e966cbf83a9b34b66f6d89b072899f5a4885b75b1cf270b1693f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b5f01247ffe466cfcfe70f56caffd8c9ed9e9058b6458199160d7f6e66c6443a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x94e3c27cc7ec15954f06001c844140e3f9469091b7c549c2080140ef28cedd98",
+        "lastblockhash" : "0x5900a8693a14b13cc8c2a3a640bc1ad410fac3ef39fc9cb542ee5a5f65689f08",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -152,10 +152,10 @@
     "callcallcodecallcode_011_OOGMAfter_1_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "21ea3c6a05b1688f0fbdc4023fbab580566962adda7243e25ce987fa3a2e214d"
+            "sourceHash" : "eababfb7b09ab944ea07f2999c018b1ca4c7922a3dbaddd9c8be3e672cc9710b"
         },
         "blocks" : [
             {
@@ -166,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fa",
-                    "hash" : "0x85b389b2e006ac6ebb1349759fdc6c99d73f7c3e65278a84940b1574ce7211e9",
-                    "mixHash" : "0x76253102806faeca56f3d695bd8e4b0cf7fd6e0ceac956cfe527d091b35fce4a",
-                    "nonce" : "0x723fca2684694241",
+                    "hash" : "0xec939e72e39fe12004ae44f03c8ab5e62d96d9a5dfc48b3adaea2d4f31c7afbc",
+                    "mixHash" : "0x6cdc4c3009786d547d45f59e5cad3eaf7d5d1705df78f022bf3851504a3a14a3",
+                    "nonce" : "0x08740b3a0946c8ad",
                     "number" : "0x01",
                     "parentHash" : "0x699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94",
                     "receiptTrie" : "0x8f9151c00aba9cf4567804c0c410ac8990a628e7b3cb2ca95fc821e15848832b",
@@ -177,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08aea858c4bb00d16914b04f4b833081de53d1972d9d8b8bfbe388c8b6ce0ce85a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08f9151c00aba9cf4567804c0c410ac8990a628e7b3cb2ca95fc821e15848832bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a076253102806faeca56f3d695bd8e4b0cf7fd6e0ceac956cfe527d091b35fce4a88723fca2684694241f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08aea858c4bb00d16914b04f4b833081de53d1972d9d8b8bfbe388c8b6ce0ce85a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08f9151c00aba9cf4567804c0c410ac8990a628e7b3cb2ca95fc821e15848832bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a06cdc4c3009786d547d45f59e5cad3eaf7d5d1705df78f022bf3851504a3a14a38808740b3a0946c8adf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -214,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b5f01247ffe466cfcfe70f56caffd8c9ed9e9058b6458199160d7f6e66c6443a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x85b389b2e006ac6ebb1349759fdc6c99d73f7c3e65278a84940b1574ce7211e9",
+        "lastblockhash" : "0xec939e72e39fe12004ae44f03c8ab5e62d96d9a5dfc48b3adaea2d4f31c7afbc",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -299,312 +299,13 @@
             }
         }
     },
-    "callcallcodecallcode_011_OOGMAfter_1_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "21ea3c6a05b1688f0fbdc4023fbab580566962adda7243e25ce987fa3a2e214d"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0155fa",
-                    "hash" : "0x4627a07f7fd7485fc88476572d465b0981cd33a271d8a3d8370ddfb4a75fea84",
-                    "mixHash" : "0xa9e47af7e594544493802e1dd4510dea51f8755e341324e96de1941555d6f749",
-                    "nonce" : "0x8576fe12a09f4a16",
-                    "number" : "0x01",
-                    "parentHash" : "0x699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94",
-                    "receiptTrie" : "0x8f9151c00aba9cf4567804c0c410ac8990a628e7b3cb2ca95fc821e15848832b",
-                    "stateRoot" : "0x8aea858c4bb00d16914b04f4b833081de53d1972d9d8b8bfbe388c8b6ce0ce85",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08aea858c4bb00d16914b04f4b833081de53d1972d9d8b8bfbe388c8b6ce0ce85a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08f9151c00aba9cf4567804c0c410ac8990a628e7b3cb2ca95fc821e15848832bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a0a9e47af7e594544493802e1dd4510dea51f8755e341324e96de1941555d6f749888576fe12a09f4a16f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x4627a07f7fd7485fc88476572d465b0981cd33a271d8a3d8370ddfb4a75fea84",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : {
-            "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_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "21ea3c6a05b1688f0fbdc4023fbab580566962adda7243e25ce987fa3a2e214d"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0150c2",
-                    "hash" : "0xe4684fbe820a4c2a83a735caae89178f0836680ecad6914861653758f0b64d2f",
-                    "mixHash" : "0x1d919746338f273fb9ff3beadb1955e0634a6fc5ff07f7e5ee9662a466b4bd88",
-                    "nonce" : "0xb5f84b8cc94a5256",
-                    "number" : "0x01",
-                    "parentHash" : "0x699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94",
-                    "receiptTrie" : "0x8b7f34d5fcdd86ab4dea0c01576ef6b0ebc111228f443d9494479875650a39ca",
-                    "stateRoot" : "0xa01db5ebd94f8300aaf0af219961f63aa6169016d4c5b75ae04c28a123e5db61",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a01db5ebd94f8300aaf0af219961f63aa6169016d4c5b75ae04c28a123e5db61a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08b7f34d5fcdd86ab4dea0c01576ef6b0ebc111228f443d9494479875650a39cab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c28203e880a01d919746338f273fb9ff3beadb1955e0634a6fc5ff07f7e5ee9662a466b4bd8888b5f84b8cc94a5256f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0xe4684fbe820a4c2a83a735caae89178f0836680ecad6914861653758f0b64d2f",
-        "network" : "Frontier",
-        "postState" : {
-            "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" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550c2",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af3e",
-                "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_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "21ea3c6a05b1688f0fbdc4023fbab580566962adda7243e25ce987fa3a2e214d"
+            "sourceHash" : "eababfb7b09ab944ea07f2999c018b1ca4c7922a3dbaddd9c8be3e672cc9710b"
         },
         "blocks" : [
             {
@@ -615,9 +316,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150c2",
-                    "hash" : "0x74f92cfe94b62d8ef70da7ec352c96eeb78adf28ab7e56737cb1ae5f9f1e3f7b",
-                    "mixHash" : "0x3b2b09a4264ba87d7bf957263f872bf86c0a0c80c8bae436ba6958bf036af6fc",
-                    "nonce" : "0x8ae99125341f0679",
+                    "hash" : "0x80de2c7ff841a6c9a0bfd2e011d576e0bfc6c482cc8c72fdad4ad57e3d305a87",
+                    "mixHash" : "0x03a3f6e451e8f4a7534334a4eca3ab2174643bd0fe0ee5119b42bd435f0121f7",
+                    "nonce" : "0xb91aa4d8ca68f7a0",
                     "number" : "0x01",
                     "parentHash" : "0x699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94",
                     "receiptTrie" : "0x8b7f34d5fcdd86ab4dea0c01576ef6b0ebc111228f443d9494479875650a39ca",
@@ -626,10 +327,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a01db5ebd94f8300aaf0af219961f63aa6169016d4c5b75ae04c28a123e5db61a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08b7f34d5fcdd86ab4dea0c01576ef6b0ebc111228f443d9494479875650a39cab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c28203e880a03b2b09a4264ba87d7bf957263f872bf86c0a0c80c8bae436ba6958bf036af6fc888ae99125341f0679f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0699e66840ad6454300b3eba086c6ebd57e8314bd6e9a1d555b1ac4238fc92d94a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a01db5ebd94f8300aaf0af219961f63aa6169016d4c5b75ae04c28a123e5db61a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08b7f34d5fcdd86ab4dea0c01576ef6b0ebc111228f443d9494479875650a39cab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c28203e880a003a3f6e451e8f4a7534334a4eca3ab2174643bd0fe0ee5119b42bd435f0121f788b91aa4d8ca68f7a0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -663,7 +364,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05b5f01247ffe466cfcfe70f56caffd8c9ed9e9058b6458199160d7f6e66c6443a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x74f92cfe94b62d8ef70da7ec352c96eeb78adf28ab7e56737cb1ae5f9f1e3f7b",
+        "lastblockhash" : "0x80de2c7ff841a6c9a0bfd2e011d576e0bfc6c482cc8c72fdad4ad57e3d305a87",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2_d0g0v0.json
index 521a3adde..f5ca0e9ec 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_OOGMAfter_2_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "18a7f245ce885ddc2c74475efde98484da933f4a2e5f54ad0dc7e2f78c35bdc4"
+            "sourceHash" : "01103f1aeff5ffb719c2388f995fd606923f511e838cb86069ded1e4144bc8fa"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0x8f7509c332a72b4c9518df784081977c18ee9f006183877404c4f6926d30bc6c",
-                    "mixHash" : "0x148195d8a77a01c93d9b7e2d823b0687426391c3ad883d85fc1847530fa7190b",
-                    "nonce" : "0x9f7251ced0d530fa",
+                    "hash" : "0xc6318f7a37483c76e6580569884bae799c9c7d744c2a5f2db8d616cb23f2741c",
+                    "mixHash" : "0x5caaacd1a1574485af0cfa50bc4e18f6402132717e988f280b20744e497bacdd",
+                    "nonce" : "0x8c9efa93b6555ef1",
                     "number" : "0x01",
                     "parentHash" : "0xf46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3a",
                     "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0f46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4884b5456688636be1baa2f79c5b327dc6f17a456501a1dfeeeca9a6ec634a6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0148195d8a77a01c93d9b7e2d823b0687426391c3ad883d85fc1847530fa7190b889f7251ced0d530faf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0f46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4884b5456688636be1baa2f79c5b327dc6f17a456501a1dfeeeca9a6ec634a6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a05caaacd1a1574485af0cfa50bc4e18f6402132717e988f280b20744e497bacdd888c9efa93b6555ef1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8f7509c332a72b4c9518df784081977c18ee9f006183877404c4f6926d30bc6c",
+        "lastblockhash" : "0xc6318f7a37483c76e6580569884bae799c9c7d744c2a5f2db8d616cb23f2741c",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -152,10 +152,10 @@
     "callcallcodecallcode_011_OOGMAfter_2_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "18a7f245ce885ddc2c74475efde98484da933f4a2e5f54ad0dc7e2f78c35bdc4"
+            "sourceHash" : "01103f1aeff5ffb719c2388f995fd606923f511e838cb86069ded1e4144bc8fa"
         },
         "blocks" : [
             {
@@ -166,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0xe95e9a36ced21bb48fa6e5584a7fe50aada8d2fdd3136d3e2e9f3210062ca287",
-                    "mixHash" : "0x6a2c0be5c49f12f0b17bff7d820a9bb9a92787327d06ed1e1f99ffecbf1cef83",
-                    "nonce" : "0x4572f9dcdfa8d1cc",
+                    "hash" : "0x23eebfc262796f91b9d5eebe3e5bc026c6606e1aee558e94d7614e7a5939b68a",
+                    "mixHash" : "0xc565d8f6aa1aab3a89c918beb801b6c80e4bc4face908ba28215dd43d3dad1a5",
+                    "nonce" : "0xc4cb85499d240464",
                     "number" : "0x01",
                     "parentHash" : "0xf46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3a",
                     "receiptTrie" : "0x782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5",
@@ -177,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0f46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0306c6dacbf5b92095477a3ea1801ed1bf9d5e1c6740c1311331b4b88dca18b28a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a06a2c0be5c49f12f0b17bff7d820a9bb9a92787327d06ed1e1f99ffecbf1cef83884572f9dcdfa8d1ccf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0f46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0306c6dacbf5b92095477a3ea1801ed1bf9d5e1c6740c1311331b4b88dca18b28a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0c565d8f6aa1aab3a89c918beb801b6c80e4bc4face908ba28215dd43d3dad1a588c4cb85499d240464f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -214,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe95e9a36ced21bb48fa6e5584a7fe50aada8d2fdd3136d3e2e9f3210062ca287",
+        "lastblockhash" : "0x23eebfc262796f91b9d5eebe3e5bc026c6606e1aee558e94d7614e7a5939b68a",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -299,312 +299,13 @@
             }
         }
     },
-    "callcallcodecallcode_011_OOGMAfter_2_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "18a7f245ce885ddc2c74475efde98484da933f4a2e5f54ad0dc7e2f78c35bdc4"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0155fd",
-                    "hash" : "0x93c6b826aeaa56af0477e01b69066b331a55d71fbde08364dbfa3e6301af8224",
-                    "mixHash" : "0x6b07ef70cac0c5d9cea343c507b4bc6a56700a4a0bfcb759329148d2862a8587",
-                    "nonce" : "0x9dadff32da8b8320",
-                    "number" : "0x01",
-                    "parentHash" : "0xf46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3a",
-                    "receiptTrie" : "0x782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5",
-                    "stateRoot" : "0x306c6dacbf5b92095477a3ea1801ed1bf9d5e1c6740c1311331b4b88dca18b28",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0f46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0306c6dacbf5b92095477a3ea1801ed1bf9d5e1c6740c1311331b4b88dca18b28a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0782fab08e276df8cd0244aff5bf3841305af79923d3f2cac1fbcb2f1778c09c5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a06b07ef70cac0c5d9cea343c507b4bc6a56700a4a0bfcb759329148d2862a8587889dadff32da8b8320f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x93c6b826aeaa56af0477e01b69066b331a55d71fbde08364dbfa3e6301af8224",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : {
-            "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_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "18a7f245ce885ddc2c74475efde98484da933f4a2e5f54ad0dc7e2f78c35bdc4"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0150cc",
-                    "hash" : "0x9448ca99ec9be58f62894b20710812761d0308529d0758edfa8c8dfd70698a15",
-                    "mixHash" : "0xfe00747b4d84295325b507351b5e97d7077ef61ca0e0fb3676ef7c3e0de746f8",
-                    "nonce" : "0x485ea3247cb70ba7",
-                    "number" : "0x01",
-                    "parentHash" : "0xf46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3a",
-                    "receiptTrie" : "0x62c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379",
-                    "stateRoot" : "0xef04802692097dc89b1f30e4c0d7b4f0c822d852976785f4986d8273eb1a967d",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0f46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef04802692097dc89b1f30e4c0d7b4f0c822d852976785f4986d8273eb1a967da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea062c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0fe00747b4d84295325b507351b5e97d7077ef61ca0e0fb3676ef7c3e0de746f888485ea3247cb70ba7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x9448ca99ec9be58f62894b20710812761d0308529d0758edfa8c8dfd70698a15",
-        "network" : "Frontier",
-        "postState" : {
-            "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" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550cc",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af34",
-                "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_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "18a7f245ce885ddc2c74475efde98484da933f4a2e5f54ad0dc7e2f78c35bdc4"
+            "sourceHash" : "01103f1aeff5ffb719c2388f995fd606923f511e838cb86069ded1e4144bc8fa"
         },
         "blocks" : [
             {
@@ -615,9 +316,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0x2ff2ba6540c68053cdae1142293841350f264e432ca9461ef4e40aac1d956492",
-                    "mixHash" : "0x1872601be287394dcf7175cb67677df9129eba6d401fce29939a3263526854ac",
-                    "nonce" : "0xce7512d56b57c60d",
+                    "hash" : "0x858d7d64e5f151d1e96afba69a4f20006d37f830fbd427fc7da03778059f43ea",
+                    "mixHash" : "0xabc99c8086619d0c25abec422020ac524142e31688b11f2f10bf9d160d42e2a6",
+                    "nonce" : "0xe3a789a9339b696d",
                     "number" : "0x01",
                     "parentHash" : "0xf46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3a",
                     "receiptTrie" : "0x62c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379",
@@ -626,10 +327,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0f46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef04802692097dc89b1f30e4c0d7b4f0c822d852976785f4986d8273eb1a967da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea062c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a01872601be287394dcf7175cb67677df9129eba6d401fce29939a3263526854ac88ce7512d56b57c60df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0f46a8f432bd0b87355e334d5cf521e230036a112781b7234f9dd3c9585d9ee3aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef04802692097dc89b1f30e4c0d7b4f0c822d852976785f4986d8273eb1a967da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea062c6a65d221c767fc11395885709cb7b37ef65fae74d1821d68f0d2ba4c1e379b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0abc99c8086619d0c25abec422020ac524142e31688b11f2f10bf9d160d42e2a688e3a789a9339b696df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -663,7 +364,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c46ee9119fcfdbcf0c60d96d86d4b830a802bbd973846bf9237a8762f92127aca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2ff2ba6540c68053cdae1142293841350f264e432ca9461ef4e40aac1d956492",
+        "lastblockhash" : "0x858d7d64e5f151d1e96afba69a4f20006d37f830fbd427fc7da03778059f43ea",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1_d0g0v0.json
index d58f7e26d..9f0a48940 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_OOGMAfter_1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "d47782e02e5d65ea8058f55d2cc741beff5f6bac99dabdf48fda1d877fad5331"
+            "sourceHash" : "55228d87714192a538f0d35ad65aeea485049ea78bf899e807e7af84a139490b"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155ff",
-                    "hash" : "0x4de231d91fcb897ed8070bd73b7bbb271d902c3118288a6ecaf7ae3f6147947c",
-                    "mixHash" : "0xbe3631375e51251af7e3ce7a8f9d3321b11b01c2f517ead2154bb0a45c6f4ebb",
-                    "nonce" : "0x84143a4a7db920d6",
+                    "hash" : "0x19e0076592197a5b35c100c048fb46da5daf29fa347d49cfa37c063e8b9efd58",
+                    "mixHash" : "0x7fdf8c95dcbf78e55cc595bddaf1ee477a139f39a7fbf22dbe090d58e9cfe2b5",
+                    "nonce" : "0x6929fcb45394827f",
                     "number" : "0x01",
                     "parentHash" : "0xc6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889e",
                     "receiptTrie" : "0x904ef34262912ab9ed82ebe8efcc7e7d10f885cb2a54713e6772e69cbee8b33c",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa026959f2e9d2862966c446c42e01b06b26de649452cd024968812bc087db9d9e8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0904ef34262912ab9ed82ebe8efcc7e7d10f885cb2a54713e6772e69cbee8b33cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155ff8203e880a0be3631375e51251af7e3ce7a8f9d3321b11b01c2f517ead2154bb0a45c6f4ebb8884143a4a7db920d6f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0c6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa026959f2e9d2862966c446c42e01b06b26de649452cd024968812bc087db9d9e8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0904ef34262912ab9ed82ebe8efcc7e7d10f885cb2a54713e6772e69cbee8b33cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155ff8203e880a07fdf8c95dcbf78e55cc595bddaf1ee477a139f39a7fbf22dbe090d58e9cfe2b5886929fcb45394827ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5555f63b1e84328b4c33bcf3684b9c00f89427419b291c48f154d08f977cbcfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4de231d91fcb897ed8070bd73b7bbb271d902c3118288a6ecaf7ae3f6147947c",
+        "lastblockhash" : "0x19e0076592197a5b35c100c048fb46da5daf29fa347d49cfa37c063e8b9efd58",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -152,10 +152,10 @@
     "callcodecallcall_100_OOGMAfter_1_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "d47782e02e5d65ea8058f55d2cc741beff5f6bac99dabdf48fda1d877fad5331"
+            "sourceHash" : "55228d87714192a538f0d35ad65aeea485049ea78bf899e807e7af84a139490b"
         },
         "blocks" : [
             {
@@ -166,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155ff",
-                    "hash" : "0x10818177b773d47bb00fee0aacfd283c3dbac0085e8c21670cdd66888a86e4fd",
-                    "mixHash" : "0xa4b9f7b45bec165c961fc0498f197cb6d148581a60f0e63921a325178a08bf96",
-                    "nonce" : "0x762e5cd2ff6084d0",
+                    "hash" : "0xad030f8075b67da57874da51e19c31804acf4e9dbd5c59c0498abfb0f330c950",
+                    "mixHash" : "0x90ee9a611f7e07dd1ca0d86af9a304bb725305b036a0e941d6533d0a0cdb2739",
+                    "nonce" : "0xc9fc49cd56a75d81",
                     "number" : "0x01",
                     "parentHash" : "0xc6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889e",
                     "receiptTrie" : "0xaf03afeaa2c9d90f1ab72fbf556b355b4fb802f3c847ff3009f8ca25fc19c674",
@@ -177,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b9c293f18a902d508ce77fbf62190970cdd4363aca72cf692bfad55895ba8758a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0af03afeaa2c9d90f1ab72fbf556b355b4fb802f3c847ff3009f8ca25fc19c674b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155ff8203e880a0a4b9f7b45bec165c961fc0498f197cb6d148581a60f0e63921a325178a08bf9688762e5cd2ff6084d0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0c6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b9c293f18a902d508ce77fbf62190970cdd4363aca72cf692bfad55895ba8758a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0af03afeaa2c9d90f1ab72fbf556b355b4fb802f3c847ff3009f8ca25fc19c674b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155ff8203e880a090ee9a611f7e07dd1ca0d86af9a304bb725305b036a0e941d6533d0a0cdb273988c9fc49cd56a75d81f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -214,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5555f63b1e84328b4c33bcf3684b9c00f89427419b291c48f154d08f977cbcfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x10818177b773d47bb00fee0aacfd283c3dbac0085e8c21670cdd66888a86e4fd",
+        "lastblockhash" : "0xad030f8075b67da57874da51e19c31804acf4e9dbd5c59c0498abfb0f330c950",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -299,163 +299,13 @@
             }
         }
     },
-    "callcodecallcall_100_OOGMAfter_1_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "d47782e02e5d65ea8058f55d2cc741beff5f6bac99dabdf48fda1d877fad5331"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0155ff",
-                    "hash" : "0x303f244fcbed238ef15d87496e62132c609d5c5183ff6f867110afc9e26bbf86",
-                    "mixHash" : "0x7206395fe829919e614c33514c768bde3c9d1eef47842aaa64e08d0a5b550218",
-                    "nonce" : "0xb2b81e4f36745d2f",
-                    "number" : "0x01",
-                    "parentHash" : "0xc6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889e",
-                    "receiptTrie" : "0xaf03afeaa2c9d90f1ab72fbf556b355b4fb802f3c847ff3009f8ca25fc19c674",
-                    "stateRoot" : "0xb9c293f18a902d508ce77fbf62190970cdd4363aca72cf692bfad55895ba8758",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0c6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b9c293f18a902d508ce77fbf62190970cdd4363aca72cf692bfad55895ba8758a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0af03afeaa2c9d90f1ab72fbf556b355b4fb802f3c847ff3009f8ca25fc19c674b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155ff8203e880a07206395fe829919e614c33514c768bde3c9d1eef47842aaa64e08d0a5b55021888b2b81e4f36745d2ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x303f244fcbed238ef15d87496e62132c609d5c5183ff6f867110afc9e26bbf86",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : {
-            "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_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "d47782e02e5d65ea8058f55d2cc741beff5f6bac99dabdf48fda1d877fad5331"
+            "sourceHash" : "55228d87714192a538f0d35ad65aeea485049ea78bf899e807e7af84a139490b"
         },
         "blocks" : [
             {
@@ -466,9 +316,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "0x947bc2ddae4cb3f523cd38c57fc9648278c643a347b4a0a32386c167ae91cf34",
-                    "mixHash" : "0xb7cc98ff1c234982eaa9d2fe7ef5e17b71565511615c3093f0655b392996fe34",
-                    "nonce" : "0xe2cfa82007ce9da3",
+                    "hash" : "0xfd1ed1eb29f6a8a8cbe5a7bc35a4d182a2995cb4991a91835ccfbfe87f843846",
+                    "mixHash" : "0xbf1951b37e2ec2868f132177ef3199ef77a0eced1da04f80cdf0c106b603861f",
+                    "nonce" : "0xd1f014b46987481a",
                     "number" : "0x01",
                     "parentHash" : "0xc6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889e",
                     "receiptTrie" : "0xdbcab094dcfdbed9ac81c2f9f65603858e995c1152dca8c3d66f8cd197d2ab26",
@@ -477,10 +327,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0c6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00d42005414f47787ed000e2a5d03e16f2b98b1aaa7464edada25424ca88c9f67a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0dbcab094dcfdbed9ac81c2f9f65603858e995c1152dca8c3d66f8cd197d2ab26b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a0b7cc98ff1c234982eaa9d2fe7ef5e17b71565511615c3093f0655b392996fe3488e2cfa82007ce9da3f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0c6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00d42005414f47787ed000e2a5d03e16f2b98b1aaa7464edada25424ca88c9f67a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0dbcab094dcfdbed9ac81c2f9f65603858e995c1152dca8c3d66f8cd197d2ab26b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a0bf1951b37e2ec2868f132177ef3199ef77a0eced1da04f80cdf0c106b603861f88d1f014b46987481af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -514,7 +364,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5555f63b1e84328b4c33bcf3684b9c00f89427419b291c48f154d08f977cbcfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x947bc2ddae4cb3f523cd38c57fc9648278c643a347b4a0a32386c167ae91cf34",
+        "lastblockhash" : "0xfd1ed1eb29f6a8a8cbe5a7bc35a4d182a2995cb4991a91835ccfbfe87f843846",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -597,154 +447,5 @@
                 }
             }
         }
-    },
-    "callcodecallcall_100_OOGMAfter_1_d0g0v0_Homestead" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "d47782e02e5d65ea8058f55d2cc741beff5f6bac99dabdf48fda1d877fad5331"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0150c9",
-                    "hash" : "0xcc4d128024fe0c308b75a613f8539f415b0c4e99ee5feb89acf697cc3c20e43a",
-                    "mixHash" : "0x818c167b2907d86ce13caaeb1f5ae854ba775d81bcc30470a3e1629e820fc0c6",
-                    "nonce" : "0xf5544678b4323bd6",
-                    "number" : "0x01",
-                    "parentHash" : "0xc6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889e",
-                    "receiptTrie" : "0x4727314bbdb90938e0f1d9dccd4016b988d4db06d4bc9404034c4451333c6dfb",
-                    "stateRoot" : "0x73f9083b6f959aa115b0ca25a51d1fa15a41d45a97a890a70f36e42bc736c984",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0c6549935815eb723c44f35c350b7ec79372a0897e7ae331ca7fa4816fafd889ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f9083b6f959aa115b0ca25a51d1fa15a41d45a97a890a70f36e42bc736c984a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04727314bbdb90938e0f1d9dccd4016b988d4db06d4bc9404034c4451333c6dfbb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c98203e880a0818c167b2907d86ce13caaeb1f5ae854ba775d81bcc30470a3e1629e820fc0c688f5544678b4323bd6f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0xcc4d128024fe0c308b75a613f8539f415b0c4e99ee5feb89acf697cc3c20e43a",
-        "network" : "Homestead",
-        "postState" : {
-            "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" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550c9",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af37",
-                "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" : {
-                }
-            }
-        }
     }
 }
\ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2_d0g0v0.json
index b738e3489..d45f6fc69 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_OOGMAfter_2_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "ae9cf1b151e63c19ff551a781f1db41ccdad8aac68e8d198c6d168f6e17fe311"
+            "sourceHash" : "cb59c7c049d7cde55ebb7a82bfd2570daf5cc9932127a69fde3e757eef216245"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fa",
-                    "hash" : "0x20466ab765d156d55b8c7b936c051b3c8a645ce90e5c21df9bc4baca3876c424",
-                    "mixHash" : "0x9c225b921cdb8a55caf6fea1731917ef70aed00b9ef4a1c2cf36a7a244496900",
-                    "nonce" : "0x709a0e3cb0a0d781",
+                    "hash" : "0x23da42ba11faab36f7de10800f5373d93f8063cc90bb997190a74c93298a515f",
+                    "mixHash" : "0xcfb6a98f3d72656585a675147eb8659b06620693f183571584f427a99422e8aa",
+                    "nonce" : "0x327733545da94ab5",
                     "number" : "0x01",
                     "parentHash" : "0xd7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eb",
                     "receiptTrie" : "0x9c15c271a51ae8f1007b852a5c63f8adccff1dafb06f5a58921c871c65abaff9",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0d7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0521ec9ee0d8829089f374f3098e8f3c8d5e970a40c760395ff24be5339612734a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09c15c271a51ae8f1007b852a5c63f8adccff1dafb06f5a58921c871c65abaff9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a09c225b921cdb8a55caf6fea1731917ef70aed00b9ef4a1c2cf36a7a24449690088709a0e3cb0a0d781f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0d7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0521ec9ee0d8829089f374f3098e8f3c8d5e970a40c760395ff24be5339612734a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09c15c271a51ae8f1007b852a5c63f8adccff1dafb06f5a58921c871c65abaff9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a0cfb6a98f3d72656585a675147eb8659b06620693f183571584f427a99422e8aa88327733545da94ab5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0285b205f333a9513ddcc1de89329a697231fe412772758ee37dca80e6b773f5aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x20466ab765d156d55b8c7b936c051b3c8a645ce90e5c21df9bc4baca3876c424",
+        "lastblockhash" : "0x23da42ba11faab36f7de10800f5373d93f8063cc90bb997190a74c93298a515f",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -152,10 +152,10 @@
     "callcodecallcall_100_OOGMAfter_2_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "ae9cf1b151e63c19ff551a781f1db41ccdad8aac68e8d198c6d168f6e17fe311"
+            "sourceHash" : "cb59c7c049d7cde55ebb7a82bfd2570daf5cc9932127a69fde3e757eef216245"
         },
         "blocks" : [
             {
@@ -166,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fa",
-                    "hash" : "0x7dff6dad447659b61dce4718d6ca97d41e9699fce2fcf354dfd7a7268b071124",
-                    "mixHash" : "0x30abced989c2cc9e3d9f777bff77713bffc26a86b800dcf5f692a9e2e307d931",
-                    "nonce" : "0x12feddc7ab74e463",
+                    "hash" : "0xee27806fefdf074192635be116851c59940fad6dfbf1e98ee9cdba83ad2777df",
+                    "mixHash" : "0x906d5097433f38523aa6f343bb79a0ff482304c427d341beb283e44233722e08",
+                    "nonce" : "0xa9d8d50f1d9708ae",
                     "number" : "0x01",
                     "parentHash" : "0xd7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eb",
                     "receiptTrie" : "0xa5a1242dce5bd8894b5a20d45052f8caaf994cfab4415164991ca6510c0a298c",
@@ -177,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0d7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010b3a117b61f19057196f91110a47127f8d48b68774ceb1003fecda60d49ddb8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a5a1242dce5bd8894b5a20d45052f8caaf994cfab4415164991ca6510c0a298cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a030abced989c2cc9e3d9f777bff77713bffc26a86b800dcf5f692a9e2e307d9318812feddc7ab74e463f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0d7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010b3a117b61f19057196f91110a47127f8d48b68774ceb1003fecda60d49ddb8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a5a1242dce5bd8894b5a20d45052f8caaf994cfab4415164991ca6510c0a298cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a0906d5097433f38523aa6f343bb79a0ff482304c427d341beb283e44233722e0888a9d8d50f1d9708aef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -214,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0285b205f333a9513ddcc1de89329a697231fe412772758ee37dca80e6b773f5aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7dff6dad447659b61dce4718d6ca97d41e9699fce2fcf354dfd7a7268b071124",
+        "lastblockhash" : "0xee27806fefdf074192635be116851c59940fad6dfbf1e98ee9cdba83ad2777df",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -299,312 +299,13 @@
             }
         }
     },
-    "callcodecallcall_100_OOGMAfter_2_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "ae9cf1b151e63c19ff551a781f1db41ccdad8aac68e8d198c6d168f6e17fe311"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0155fa",
-                    "hash" : "0xad5d0e4bea801bccbd610600bb99b2c8b1af7ecc3da2e5d953d21faadce87d24",
-                    "mixHash" : "0x2181ac8eb3da71f83ce33ecc0db9cf4798c870823d4768a26be1cd873de5d533",
-                    "nonce" : "0x604564df324914fc",
-                    "number" : "0x01",
-                    "parentHash" : "0xd7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eb",
-                    "receiptTrie" : "0xa5a1242dce5bd8894b5a20d45052f8caaf994cfab4415164991ca6510c0a298c",
-                    "stateRoot" : "0x10b3a117b61f19057196f91110a47127f8d48b68774ceb1003fecda60d49ddb8",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0d7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010b3a117b61f19057196f91110a47127f8d48b68774ceb1003fecda60d49ddb8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a5a1242dce5bd8894b5a20d45052f8caaf994cfab4415164991ca6510c0a298cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a02181ac8eb3da71f83ce33ecc0db9cf4798c870823d4768a26be1cd873de5d53388604564df324914fcf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0xad5d0e4bea801bccbd610600bb99b2c8b1af7ecc3da2e5d953d21faadce87d24",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : {
-            "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_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "ae9cf1b151e63c19ff551a781f1db41ccdad8aac68e8d198c6d168f6e17fe311"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x029fe0",
-                    "hash" : "0x9420408adbd4ebf58439d4e24db3a36236cb5846088cac69a92cfa856d323487",
-                    "mixHash" : "0x3bdb8fd252f078dafeaeaf3745aeb58b0cd7b64494aa3d9d48713390ad1deedf",
-                    "nonce" : "0x67fcf6f030aced20",
-                    "number" : "0x01",
-                    "parentHash" : "0xd7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eb",
-                    "receiptTrie" : "0xfa85ee1da544d20ac13450d12d3fa5f1c46f40db9bc95cc1bc5bb13a7afa18d6",
-                    "stateRoot" : "0x2128977407c28b9ae0c8d710dd5103211f4d9aa0ed57b23642e221c0ec9e7597",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0d7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02128977407c28b9ae0c8d710dd5103211f4d9aa0ed57b23642e221c0ec9e7597a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fa85ee1da544d20ac13450d12d3fa5f1c46f40db9bc95cc1bc5bb13a7afa18d6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a03bdb8fd252f078dafeaeaf3745aeb58b0cd7b64494aa3d9d48713390ad1deedf8867fcf6f030aced20f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x9420408adbd4ebf58439d4e24db3a36236cb5846088cac69a92cfa856d323487",
-        "network" : "Frontier",
-        "postState" : {
-            "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" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f69fe0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7616020",
-                "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_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "ae9cf1b151e63c19ff551a781f1db41ccdad8aac68e8d198c6d168f6e17fe311"
+            "sourceHash" : "cb59c7c049d7cde55ebb7a82bfd2570daf5cc9932127a69fde3e757eef216245"
         },
         "blocks" : [
             {
@@ -615,9 +316,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150c9",
-                    "hash" : "0x65e4c93236a1690f1e34d472696d888a8cdef7b080db2277be689eb2b5b3c4b6",
-                    "mixHash" : "0x293f78471f88f0dfc93244fe768cea881cde28e4df467c353e782d20fb0dfa75",
-                    "nonce" : "0xf2f8a3c3158d024d",
+                    "hash" : "0x0ab2852aadc191ed73ee09d6782b0ef3527676e5e8fc9364984cda4036df864c",
+                    "mixHash" : "0x8a68a1f179689b855c713ac79b9e68c60b19bf9a8912fbcc4806d34582299655",
+                    "nonce" : "0x3572c20602938771",
                     "number" : "0x01",
                     "parentHash" : "0xd7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eb",
                     "receiptTrie" : "0x01d39682eae93e490c236646bba33ab94ec805829ddeadda107612cd49bcf2de",
@@ -626,10 +327,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0d7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e210ded9d183c7a0118ea534649569a2fa59346fda49459511a04f324e1cb320a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea001d39682eae93e490c236646bba33ab94ec805829ddeadda107612cd49bcf2deb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c98203e880a0293f78471f88f0dfc93244fe768cea881cde28e4df467c353e782d20fb0dfa7588f2f8a3c3158d024df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0d7e412b220fccbbfd792a7e3d9fe34ac84b9d9268b7a1bec01c19743dc4a54eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e210ded9d183c7a0118ea534649569a2fa59346fda49459511a04f324e1cb320a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea001d39682eae93e490c236646bba33ab94ec805829ddeadda107612cd49bcf2deb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c98203e880a08a68a1f179689b855c713ac79b9e68c60b19bf9a8912fbcc4806d34582299655883572c20602938771f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -663,7 +364,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0285b205f333a9513ddcc1de89329a697231fe412772758ee37dca80e6b773f5aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x65e4c93236a1690f1e34d472696d888a8cdef7b080db2277be689eb2b5b3c4b6",
+        "lastblockhash" : "0x0ab2852aadc191ed73ee09d6782b0ef3527676e5e8fc9364984cda4036df864c",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3_d0g0v0.json
index 5090c9d29..e8598a78e 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_OOGMAfter_3_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "ae4318c41784056023e22edf9c18bdce3e64b8d9e1d55215fed640db965948b8"
+            "sourceHash" : "b012774ab2b36b11fc98e146ebc9d194f9d46b521c6bea9f7ea2fb07ff094e84"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0xa47252b1d01a4b99a62079e0594b08d312a19240ddb2098e02494df262d39d87",
-                    "mixHash" : "0x6652d0da57f4bbc51ea622722157a1a5ee60cbf1fcfd1e04d88920ad4c6d8b69",
-                    "nonce" : "0xfd07288f08042692",
+                    "hash" : "0x12ca9e022dd7fc8af748d72bfe5de0f40e3f558a27cd2617a68c2a0d00c2bfd8",
+                    "mixHash" : "0x7eded16056800cf3f6c9fa5a742b2be4ceea11597b7360568ebc2868bf80ebbd",
+                    "nonce" : "0x1958c0cbda2fa04a",
                     "number" : "0x01",
                     "parentHash" : "0x48077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776",
                     "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a048077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080e9362f13cdf245f820daa3105aa5a37cdf74bc07fab25a98da72c760e67ed6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a06652d0da57f4bbc51ea622722157a1a5ee60cbf1fcfd1e04d88920ad4c6d8b6988fd07288f08042692f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a048077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa080e9362f13cdf245f820daa3105aa5a37cdf74bc07fab25a98da72c760e67ed6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a07eded16056800cf3f6c9fa5a742b2be4ceea11597b7360568ebc2868bf80ebbd881958c0cbda2fa04af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa47252b1d01a4b99a62079e0594b08d312a19240ddb2098e02494df262d39d87",
+        "lastblockhash" : "0x12ca9e022dd7fc8af748d72bfe5de0f40e3f558a27cd2617a68c2a0d00c2bfd8",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -152,10 +152,10 @@
     "callcodecallcall_100_OOGMAfter_3_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "ae4318c41784056023e22edf9c18bdce3e64b8d9e1d55215fed640db965948b8"
+            "sourceHash" : "b012774ab2b36b11fc98e146ebc9d194f9d46b521c6bea9f7ea2fb07ff094e84"
         },
         "blocks" : [
             {
@@ -166,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0x5616696051182948837cd6f47babde5ca80e161f538ad0ee4c0d3690be623e7c",
-                    "mixHash" : "0x66e2d77984497c8f848ace0d8af9fd94fb518aa6449e730e9221e77284526ee7",
-                    "nonce" : "0xa3195f440f3b4f50",
+                    "hash" : "0x0dec10ac105c31d4e8a85d772781a940cdcb10aeed8b1672b1b4c7bde7232686",
+                    "mixHash" : "0x9826bb15c7e9356256f418d84dbceac7f39139a2b2022d4acf921047c89a33d5",
+                    "nonce" : "0x0a319c16d5d4d3c9",
                     "number" : "0x01",
                     "parentHash" : "0x48077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776",
                     "receiptTrie" : "0x43c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05",
@@ -177,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a048077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040d6012251ddd9a6759498d4ea32ad8f5a5b6f541bc17e5673fc063596ceef18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea043c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a066e2d77984497c8f848ace0d8af9fd94fb518aa6449e730e9221e77284526ee788a3195f440f3b4f50f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a048077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040d6012251ddd9a6759498d4ea32ad8f5a5b6f541bc17e5673fc063596ceef18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea043c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a09826bb15c7e9356256f418d84dbceac7f39139a2b2022d4acf921047c89a33d5880a319c16d5d4d3c9f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -214,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5616696051182948837cd6f47babde5ca80e161f538ad0ee4c0d3690be623e7c",
+        "lastblockhash" : "0x0dec10ac105c31d4e8a85d772781a940cdcb10aeed8b1672b1b4c7bde7232686",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -299,312 +299,13 @@
             }
         }
     },
-    "callcodecallcall_100_OOGMAfter_3_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "ae4318c41784056023e22edf9c18bdce3e64b8d9e1d55215fed640db965948b8"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0155fd",
-                    "hash" : "0xce20b5621bcad4539523ed47212cee1579adda07dc86e79dbd7c4c110a081077",
-                    "mixHash" : "0xeb9130c9f117188396fafad06fe7ec2dbf49cc5173c252a943e15ce5ed869f57",
-                    "nonce" : "0xbbeb6defc9d61eb8",
-                    "number" : "0x01",
-                    "parentHash" : "0x48077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776",
-                    "receiptTrie" : "0x43c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05",
-                    "stateRoot" : "0x40d6012251ddd9a6759498d4ea32ad8f5a5b6f541bc17e5673fc063596ceef18",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a048077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040d6012251ddd9a6759498d4ea32ad8f5a5b6f541bc17e5673fc063596ceef18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea043c25380753975f419770b25e257a9ae90dd559074bf9cfca52975871920bf05b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0eb9130c9f117188396fafad06fe7ec2dbf49cc5173c252a943e15ce5ed869f5788bbeb6defc9d61eb8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0xce20b5621bcad4539523ed47212cee1579adda07dc86e79dbd7c4c110a081077",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : {
-            "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_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "ae4318c41784056023e22edf9c18bdce3e64b8d9e1d55215fed640db965948b8"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0150cc",
-                    "hash" : "0x5a743c4e84c493c6b9c2cdb209d5b3bf3cb284fa7517ce618f9684d2ef0e9092",
-                    "mixHash" : "0x2196a0e08a7dbb5be97d6b052106b58da042f1ce80390b15affd24bdaf26cbeb",
-                    "nonce" : "0x6b1816218a0f4512",
-                    "number" : "0x01",
-                    "parentHash" : "0x48077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776",
-                    "receiptTrie" : "0x31a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6",
-                    "stateRoot" : "0xe9311a44963df12e57ebaa6ff0fd625b2effc80eb98fc8c73fbe18cf975d020e",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a048077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9311a44963df12e57ebaa6ff0fd625b2effc80eb98fc8c73fbe18cf975d020ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea031a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a02196a0e08a7dbb5be97d6b052106b58da042f1ce80390b15affd24bdaf26cbeb886b1816218a0f4512f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x5a743c4e84c493c6b9c2cdb209d5b3bf3cb284fa7517ce618f9684d2ef0e9092",
-        "network" : "Frontier",
-        "postState" : {
-            "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" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550cc",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af34",
-                "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_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "ae4318c41784056023e22edf9c18bdce3e64b8d9e1d55215fed640db965948b8"
+            "sourceHash" : "b012774ab2b36b11fc98e146ebc9d194f9d46b521c6bea9f7ea2fb07ff094e84"
         },
         "blocks" : [
             {
@@ -615,9 +316,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0x5c0cd5a8f5e50f865a468fdd4b18a6a676a0ea58bf221863c0546bf481428906",
-                    "mixHash" : "0xe53878ae935ea663d701f13ede618210a6ae327021e2afd0c319378e99d37d7e",
-                    "nonce" : "0xe7bd5f1fad5e3828",
+                    "hash" : "0x61107f2cc772cb61ea4879acba03214ab68ca658ac92a182ed397480ed2c507f",
+                    "mixHash" : "0xed8badd78d02a95c8e0cb41c10caf8caca014a9347d3110c04eae3c528302514",
+                    "nonce" : "0x9ada92f0635237d6",
                     "number" : "0x01",
                     "parentHash" : "0x48077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776",
                     "receiptTrie" : "0x31a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6",
@@ -626,10 +327,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a048077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9311a44963df12e57ebaa6ff0fd625b2effc80eb98fc8c73fbe18cf975d020ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea031a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0e53878ae935ea663d701f13ede618210a6ae327021e2afd0c319378e99d37d7e88e7bd5f1fad5e3828f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a048077a517a01b66e24d0b58d671a51d5974f74c6b36fa8a9461aed12efb00776a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9311a44963df12e57ebaa6ff0fd625b2effc80eb98fc8c73fbe18cf975d020ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea031a860b801dac23f825118b4b6292d3d7fec79cd10898fdceda4a1d8a51dd5c6b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0ed8badd78d02a95c8e0cb41c10caf8caca014a9347d3110c04eae3c528302514889ada92f0635237d6f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -663,7 +364,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a09f205bc42d23d72b2bc7ad16745b78020fec4840a7bb626ebb90dd6f034620a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5c0cd5a8f5e50f865a468fdd4b18a6a676a0ea58bf221863c0546bf481428906",
+        "lastblockhash" : "0x61107f2cc772cb61ea4879acba03214ab68ca658ac92a182ed397480ed2c507f",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1_d0g0v0.json
index af0c7c905..5d0fdd1b1 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_OOGMAfter_1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "6fe916e49038097966e97a782d27c6d224370e85bee367b9c25ecebd90a19584"
+            "sourceHash" : "3a69fbc5ebac91164c19109f33da24000bb1f2a911f3ad05d0141b5bd75d50d2"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0xd9837613dc7c80d236cd4c2dd2a9a5b868ad0f5ef645728f74a6fe081817cb6f",
-                    "mixHash" : "0xc145d098befc809645477ae126866e5a999bbc8a30fb03e98a42873ec555c849",
-                    "nonce" : "0x896810b96dd4407a",
+                    "hash" : "0xbb6126dab81b551b6951a47cc93c3761d62cf60ea09862a00fe60e707979b915",
+                    "mixHash" : "0x7e77b4cdc973c094a4d5cb7f64e1a4877f2dbe788f8898134f66c18e4f073070",
+                    "nonce" : "0x1a656064a9db316a",
                     "number" : "0x01",
                     "parentHash" : "0x466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9",
                     "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03444af48255e6855919590ba0a18bdebd9b5314570948c4d96d90beedd41c64da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0c145d098befc809645477ae126866e5a999bbc8a30fb03e98a42873ec555c84988896810b96dd4407af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03444af48255e6855919590ba0a18bdebd9b5314570948c4d96d90beedd41c64da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a07e77b4cdc973c094a4d5cb7f64e1a4877f2dbe788f8898134f66c18e4f073070881a656064a9db316af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd9837613dc7c80d236cd4c2dd2a9a5b868ad0f5ef645728f74a6fe081817cb6f",
+        "lastblockhash" : "0xbb6126dab81b551b6951a47cc93c3761d62cf60ea09862a00fe60e707979b915",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -152,10 +152,10 @@
     "callcodecallcallcode_101_OOGMAfter_1_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "6fe916e49038097966e97a782d27c6d224370e85bee367b9c25ecebd90a19584"
+            "sourceHash" : "3a69fbc5ebac91164c19109f33da24000bb1f2a911f3ad05d0141b5bd75d50d2"
         },
         "blocks" : [
             {
@@ -166,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0xed72ecc859395fe98950d1064ef2f845e2224f9ee591327e686208e42e4547ac",
-                    "mixHash" : "0x6f7be843976d4bb31a3a441603948fc07a9dba5d46b3ef86d29c535956ed5f6d",
-                    "nonce" : "0x7a314885c5a5ef0d",
+                    "hash" : "0x1e983c54a99928753e94d235eeef6e35bdd258672b68242049be3d5bf3178a76",
+                    "mixHash" : "0xeaf928622015f435f7371272a5a4ab41dc4d11c0d6bd7457559b179be79b1885",
+                    "nonce" : "0x2e08d7546d670ceb",
                     "number" : "0x01",
                     "parentHash" : "0x466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9",
                     "receiptTrie" : "0x04c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24",
@@ -177,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eaced69efe1c7081e4092c09c858d0ef1f22b4a7a6a55035aaefdbcec2518f3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a06f7be843976d4bb31a3a441603948fc07a9dba5d46b3ef86d29c535956ed5f6d887a314885c5a5ef0df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eaced69efe1c7081e4092c09c858d0ef1f22b4a7a6a55035aaefdbcec2518f3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0eaf928622015f435f7371272a5a4ab41dc4d11c0d6bd7457559b179be79b1885882e08d7546d670cebf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -214,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xed72ecc859395fe98950d1064ef2f845e2224f9ee591327e686208e42e4547ac",
+        "lastblockhash" : "0x1e983c54a99928753e94d235eeef6e35bdd258672b68242049be3d5bf3178a76",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -299,312 +299,13 @@
             }
         }
     },
-    "callcodecallcallcode_101_OOGMAfter_1_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "6fe916e49038097966e97a782d27c6d224370e85bee367b9c25ecebd90a19584"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0155fd",
-                    "hash" : "0x459d243db40bdb9e1ea70bbb5398e48081694ab87631764de697d627f7d68b08",
-                    "mixHash" : "0x30b6935671dcc285f5fd1aaf3daebe1e6669800942d6a3bc069d2fbcc84a71b1",
-                    "nonce" : "0xca6b0ef1836f5750",
-                    "number" : "0x01",
-                    "parentHash" : "0x466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9",
-                    "receiptTrie" : "0x04c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24",
-                    "stateRoot" : "0x5eaced69efe1c7081e4092c09c858d0ef1f22b4a7a6a55035aaefdbcec2518f3",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05eaced69efe1c7081e4092c09c858d0ef1f22b4a7a6a55035aaefdbcec2518f3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004c5bb135cc7f94364f49e76f6455587849e11b6b7e5ca5d9072ee296a745a24b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a030b6935671dcc285f5fd1aaf3daebe1e6669800942d6a3bc069d2fbcc84a71b188ca6b0ef1836f5750f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x459d243db40bdb9e1ea70bbb5398e48081694ab87631764de697d627f7d68b08",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : {
-            "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_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "6fe916e49038097966e97a782d27c6d224370e85bee367b9c25ecebd90a19584"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0150cc",
-                    "hash" : "0x2395861d97ad2f4f4dd5af9760f0b756b10002e3cf854977ebeebe6398fe384b",
-                    "mixHash" : "0x2e9e609772fa196d4b69fe4b28904b084cd06b7f5aadec71860bbd1d9338038d",
-                    "nonce" : "0x15808b1c78cf022c",
-                    "number" : "0x01",
-                    "parentHash" : "0x466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9",
-                    "receiptTrie" : "0x04e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95",
-                    "stateRoot" : "0xb490d128911d251c1328732584493fc2d2fe3a43933ab64e22e7f531e9133199",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b490d128911d251c1328732584493fc2d2fe3a43933ab64e22e7f531e9133199a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a02e9e609772fa196d4b69fe4b28904b084cd06b7f5aadec71860bbd1d9338038d8815808b1c78cf022cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x2395861d97ad2f4f4dd5af9760f0b756b10002e3cf854977ebeebe6398fe384b",
-        "network" : "Frontier",
-        "postState" : {
-            "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" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550cc",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af34",
-                "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_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "6fe916e49038097966e97a782d27c6d224370e85bee367b9c25ecebd90a19584"
+            "sourceHash" : "3a69fbc5ebac91164c19109f33da24000bb1f2a911f3ad05d0141b5bd75d50d2"
         },
         "blocks" : [
             {
@@ -615,9 +316,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0xcdc7cca3c9ddfbec6885ad9ff64f18d7e0a3dcc4d2a6b36b3e8521d01db95df8",
-                    "mixHash" : "0x63156fec10f1441f4325b282aed15ae4b0b1727bdf567dc0307a5ae4deb050ba",
-                    "nonce" : "0xe5b567266bf167f6",
+                    "hash" : "0xa07243670a3641a12fb43d92aa786769237718a5de2f3dbe02cab7a69b0b82c9",
+                    "mixHash" : "0xeae970346f3c1cd82d174706b947142e42469f366b67bd18e85b4d1ca67e4f4c",
+                    "nonce" : "0xdfbfe8086e286c65",
                     "number" : "0x01",
                     "parentHash" : "0x466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9",
                     "receiptTrie" : "0x04e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95",
@@ -626,10 +327,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b490d128911d251c1328732584493fc2d2fe3a43933ab64e22e7f531e9133199a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a063156fec10f1441f4325b282aed15ae4b0b1727bdf567dc0307a5ae4deb050ba88e5b567266bf167f6f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0466c656cb36aff58cdd052d736cfc7dc9ceffcb8eed51433a645e1afd6f772b9a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b490d128911d251c1328732584493fc2d2fe3a43933ab64e22e7f531e9133199a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea004e6a9873b761ffa9a3df8e01126f3549627416db988278018e8beded85efc95b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0eae970346f3c1cd82d174706b947142e42469f366b67bd18e85b4d1ca67e4f4c88dfbfe8086e286c65f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -663,7 +364,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091bc1bc7c7a8c101259cae4c9e2cebd50801402803abfc5db370a4120f9de3e1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcdc7cca3c9ddfbec6885ad9ff64f18d7e0a3dcc4d2a6b36b3e8521d01db95df8",
+        "lastblockhash" : "0xa07243670a3641a12fb43d92aa786769237718a5de2f3dbe02cab7a69b0b82c9",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2_d0g0v0.json
index d065972be..c7e2cc271 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_OOGMAfter_2_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "d498950ee293da1fe860b0cf14e3d0953f9ff67292c770937b2aa2a99acea357"
+            "sourceHash" : "91d6e8c2cc74131c2a35c901d2342dd881cb4a31f8b823e525d57db0f439dbe6"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155ff",
-                    "hash" : "0xcdaec5107b12081e994395ae8a7f0d48ae0fa4798a27f37933e10f2a930f70fa",
-                    "mixHash" : "0xaf1538e18f09ba1fdd509160a4bdca1a67a959b8897ed07eebf187f70fed5993",
-                    "nonce" : "0xf26e87e7c0d17e75",
+                    "hash" : "0xe699fae120765aafeecc61d7587c23eaac49b7484adc1d3180494acfdba678b9",
+                    "mixHash" : "0x9cb67bee6dafa5425aba48ba02bb04b1ad0119bf4da85904e71b4f5820890532",
+                    "nonce" : "0x63474540d3d3a285",
                     "number" : "0x01",
                     "parentHash" : "0xa5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015",
                     "receiptTrie" : "0x904ef34262912ab9ed82ebe8efcc7e7d10f885cb2a54713e6772e69cbee8b33c",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d8c12ec1a145a2df667f70208f52320edb9c984abaf9a75b268a63a3421698efa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0904ef34262912ab9ed82ebe8efcc7e7d10f885cb2a54713e6772e69cbee8b33cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155ff8203e880a0af1538e18f09ba1fdd509160a4bdca1a67a959b8897ed07eebf187f70fed599388f26e87e7c0d17e75f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0a5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d8c12ec1a145a2df667f70208f52320edb9c984abaf9a75b268a63a3421698efa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0904ef34262912ab9ed82ebe8efcc7e7d10f885cb2a54713e6772e69cbee8b33cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155ff8203e880a09cb67bee6dafa5425aba48ba02bb04b1ad0119bf4da85904e71b4f58208905328863474540d3d3a285f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6e3d55d5419754de209b45f7a60826251010d7bbb3c9b2b62c440c98da53b2fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcdaec5107b12081e994395ae8a7f0d48ae0fa4798a27f37933e10f2a930f70fa",
+        "lastblockhash" : "0xe699fae120765aafeecc61d7587c23eaac49b7484adc1d3180494acfdba678b9",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -152,10 +152,10 @@
     "callcodecallcallcode_101_OOGMAfter_2_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "d498950ee293da1fe860b0cf14e3d0953f9ff67292c770937b2aa2a99acea357"
+            "sourceHash" : "91d6e8c2cc74131c2a35c901d2342dd881cb4a31f8b823e525d57db0f439dbe6"
         },
         "blocks" : [
             {
@@ -166,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155ff",
-                    "hash" : "0x3cac4ccfd042482c4f4eb5e3ba03a75d118f0c4003887c45e97c33fdadb0126b",
-                    "mixHash" : "0xec551739f5f2977acf48c3c67dcaee3acf848fcc7fe596f347419041591d491c",
-                    "nonce" : "0x4577af743079df31",
+                    "hash" : "0x9e365b799c9eee189d9188b8d63c2222deb5df076bd53be5823a47678ef18e3f",
+                    "mixHash" : "0x1af3c4fd8e89c09aa25641a7e1bde4f833a0d4dfe5bfa9054d4e3be6e9fd81ab",
+                    "nonce" : "0x8cc4e5b8400c0e45",
                     "number" : "0x01",
                     "parentHash" : "0xa5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015",
                     "receiptTrie" : "0xc8e92577ec9ad352d64d260daa14f1a2df767271828d6cb565d692d8916d1f11",
@@ -177,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa092c76c3ab5142ae8f1fc2e69609e4af4febffa1bea15d9a60ddc3813316e90a6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c8e92577ec9ad352d64d260daa14f1a2df767271828d6cb565d692d8916d1f11b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155ff8203e880a0ec551739f5f2977acf48c3c67dcaee3acf848fcc7fe596f347419041591d491c884577af743079df31f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0a5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa092c76c3ab5142ae8f1fc2e69609e4af4febffa1bea15d9a60ddc3813316e90a6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c8e92577ec9ad352d64d260daa14f1a2df767271828d6cb565d692d8916d1f11b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155ff8203e880a01af3c4fd8e89c09aa25641a7e1bde4f833a0d4dfe5bfa9054d4e3be6e9fd81ab888cc4e5b8400c0e45f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -214,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6e3d55d5419754de209b45f7a60826251010d7bbb3c9b2b62c440c98da53b2fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3cac4ccfd042482c4f4eb5e3ba03a75d118f0c4003887c45e97c33fdadb0126b",
+        "lastblockhash" : "0x9e365b799c9eee189d9188b8d63c2222deb5df076bd53be5823a47678ef18e3f",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -299,312 +299,13 @@
             }
         }
     },
-    "callcodecallcallcode_101_OOGMAfter_2_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "d498950ee293da1fe860b0cf14e3d0953f9ff67292c770937b2aa2a99acea357"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0155ff",
-                    "hash" : "0x42d3252bc43b42c2689eed4d01177f6dc8705be9735fd0acb6fdb11213135668",
-                    "mixHash" : "0x4a36ad75d7b5364eda185bde0e710f2971a88f9aab1210a3e1c3030ba36fc955",
-                    "nonce" : "0x7b4127d6cd82da5c",
-                    "number" : "0x01",
-                    "parentHash" : "0xa5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015",
-                    "receiptTrie" : "0xc8e92577ec9ad352d64d260daa14f1a2df767271828d6cb565d692d8916d1f11",
-                    "stateRoot" : "0x92c76c3ab5142ae8f1fc2e69609e4af4febffa1bea15d9a60ddc3813316e90a6",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0a5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa092c76c3ab5142ae8f1fc2e69609e4af4febffa1bea15d9a60ddc3813316e90a6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c8e92577ec9ad352d64d260daa14f1a2df767271828d6cb565d692d8916d1f11b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155ff8203e880a04a36ad75d7b5364eda185bde0e710f2971a88f9aab1210a3e1c3030ba36fc955887b4127d6cd82da5cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x42d3252bc43b42c2689eed4d01177f6dc8705be9735fd0acb6fdb11213135668",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : {
-            "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_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "d498950ee293da1fe860b0cf14e3d0953f9ff67292c770937b2aa2a99acea357"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x029fe0",
-                    "hash" : "0xbf6891afffee8018062389e6eae9201b0b67f290e57ca207813d31fc4c4f57ee",
-                    "mixHash" : "0x829c1e21ed203af5874d280a49a3accc98da24900b7df948a8c6f78150c3438b",
-                    "nonce" : "0x7280a27bfc451437",
-                    "number" : "0x01",
-                    "parentHash" : "0xa5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015",
-                    "receiptTrie" : "0x35d2c1620446175fe04bd2e38f488615f0476e6f412a858f374997ffa88cd2b5",
-                    "stateRoot" : "0x383714aa98a691acdccf099e46648052b45ce6dd8ca97ccd346660a9e7dcc3e4",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0a5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0383714aa98a691acdccf099e46648052b45ce6dd8ca97ccd346660a9e7dcc3e4a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea035d2c1620446175fe04bd2e38f488615f0476e6f412a858f374997ffa88cd2b5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a0829c1e21ed203af5874d280a49a3accc98da24900b7df948a8c6f78150c3438b887280a27bfc451437f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0xbf6891afffee8018062389e6eae9201b0b67f290e57ca207813d31fc4c4f57ee",
-        "network" : "Frontier",
-        "postState" : {
-            "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" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f69fe0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7616020",
-                "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_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "d498950ee293da1fe860b0cf14e3d0953f9ff67292c770937b2aa2a99acea357"
+            "sourceHash" : "91d6e8c2cc74131c2a35c901d2342dd881cb4a31f8b823e525d57db0f439dbe6"
         },
         "blocks" : [
             {
@@ -615,9 +316,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150c9",
-                    "hash" : "0xdbbb72dff5c37b4060a5cfd5cb01972a06eb82ea37e59ecbb72812521c798154",
-                    "mixHash" : "0xf9618ec3a4a19386887d6c302b278dc73ddb4d6b1a22b6a81ea068f2729d2ca9",
-                    "nonce" : "0x3b9e5dda9c995757",
+                    "hash" : "0x35e031ae7f56589b7ecb68f668399ffe77de8dbebeca3eed234f9c300f6e9dfb",
+                    "mixHash" : "0x630c5cc84f45a642e92c74563deb2149a271d68ad81f941e112341d406d4b8df",
+                    "nonce" : "0x3a7802dd6edc5b38",
                     "number" : "0x01",
                     "parentHash" : "0xa5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015",
                     "receiptTrie" : "0x103cd4aa2e002867e45d81282907befbf9ca183c1a6816f94cb1e78b8c39f206",
@@ -626,10 +327,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e9206d98842c36b016825e42ca5ba02f2644586033ecd10b646180572a11019a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0103cd4aa2e002867e45d81282907befbf9ca183c1a6816f94cb1e78b8c39f206b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c98203e880a0f9618ec3a4a19386887d6c302b278dc73ddb4d6b1a22b6a81ea068f2729d2ca9883b9e5dda9c995757f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0a5a876146cc6c0baa0baa548f615d987bfcaf71ea6ba7cf33d1677ef7d0c9015a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e9206d98842c36b016825e42ca5ba02f2644586033ecd10b646180572a11019a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0103cd4aa2e002867e45d81282907befbf9ca183c1a6816f94cb1e78b8c39f206b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c98203e880a0630c5cc84f45a642e92c74563deb2149a271d68ad81f941e112341d406d4b8df883a7802dd6edc5b38f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -663,7 +364,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6e3d55d5419754de209b45f7a60826251010d7bbb3c9b2b62c440c98da53b2fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdbbb72dff5c37b4060a5cfd5cb01972a06eb82ea37e59ecbb72812521c798154",
+        "lastblockhash" : "0x35e031ae7f56589b7ecb68f668399ffe77de8dbebeca3eed234f9c300f6e9dfb",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3_d0g0v0.json
index 055b4332f..5b30ab6df 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_OOGMAfter_3_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "d179cb048b887cbcf12edb5c43000ee16e22cbb64c14bdc31f738a22238dd64a"
+            "sourceHash" : "8c6a76c1fd38b2b27e6609074b01893079362f6e4a0a8e4f8fcf048889f16342"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fa",
-                    "hash" : "0x24130229dce82b3d3bcf7160538d3bbc3aa3ec2a6d402c2031893f9ac9998884",
-                    "mixHash" : "0x51bf2fd1efac557f8cfe46d2d87482f800b73a504ba492fd1e33afef26cb800c",
-                    "nonce" : "0x86822cf1d5cc2caf",
+                    "hash" : "0x56be6f356a9737fae73dc3a13d6a5ef7a2723927225e3156c6665fbb6a0b64b5",
+                    "mixHash" : "0xc3574910e18ca7c8eb9f8fd0b4cc7eb80d7604bcfb7b859b122a9f3cf96b12f0",
+                    "nonce" : "0x4cf8f96af8a45a78",
                     "number" : "0x01",
                     "parentHash" : "0x2ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512be",
                     "receiptTrie" : "0x9c15c271a51ae8f1007b852a5c63f8adccff1dafb06f5a58921c871c65abaff9",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a02ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b05469d725c0380510dc45716f8392df6c7f761c47ec545de405271642ec5637a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09c15c271a51ae8f1007b852a5c63f8adccff1dafb06f5a58921c871c65abaff9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a051bf2fd1efac557f8cfe46d2d87482f800b73a504ba492fd1e33afef26cb800c8886822cf1d5cc2caff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a02ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b05469d725c0380510dc45716f8392df6c7f761c47ec545de405271642ec5637a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09c15c271a51ae8f1007b852a5c63f8adccff1dafb06f5a58921c871c65abaff9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a0c3574910e18ca7c8eb9f8fd0b4cc7eb80d7604bcfb7b859b122a9f3cf96b12f0884cf8f96af8a45a78f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1b3e2ee0d83629e84e64f0429d9df8fe6c2b8d8df1cce7870afde605f4fd61ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x24130229dce82b3d3bcf7160538d3bbc3aa3ec2a6d402c2031893f9ac9998884",
+        "lastblockhash" : "0x56be6f356a9737fae73dc3a13d6a5ef7a2723927225e3156c6665fbb6a0b64b5",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -152,10 +152,10 @@
     "callcodecallcallcode_101_OOGMAfter_3_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "d179cb048b887cbcf12edb5c43000ee16e22cbb64c14bdc31f738a22238dd64a"
+            "sourceHash" : "8c6a76c1fd38b2b27e6609074b01893079362f6e4a0a8e4f8fcf048889f16342"
         },
         "blocks" : [
             {
@@ -166,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fa",
-                    "hash" : "0x44abd407abc0300a3b5f84b87605937da7a6d040318d34f7bb26da677cea3135",
-                    "mixHash" : "0x222d85ab837c7a5aadb79f1e87d129ac11ad7a633ebe9b623c94625359e89b4d",
-                    "nonce" : "0xfafa23aead16606f",
+                    "hash" : "0xfa5af65b4e00f0e0c1b5000f651c562a1046e74fa51e0e7718c8e66498a52345",
+                    "mixHash" : "0x12e829d1810bbfb5130baa093186de12adb0774fec6010496803ee387860b9f8",
+                    "nonce" : "0x19887454644b475f",
                     "number" : "0x01",
                     "parentHash" : "0x2ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512be",
                     "receiptTrie" : "0x9afc32c9268c7f1654ad4d462857d898cf830ad541a88890f9b514e8c93813aa",
@@ -177,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a02ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01e9534f8fbf73e256ac03b54feb61c3c932364dab0a60b30b9566e7e8ce080ada0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09afc32c9268c7f1654ad4d462857d898cf830ad541a88890f9b514e8c93813aab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a0222d85ab837c7a5aadb79f1e87d129ac11ad7a633ebe9b623c94625359e89b4d88fafa23aead16606ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a02ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01e9534f8fbf73e256ac03b54feb61c3c932364dab0a60b30b9566e7e8ce080ada0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09afc32c9268c7f1654ad4d462857d898cf830ad541a88890f9b514e8c93813aab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a012e829d1810bbfb5130baa093186de12adb0774fec6010496803ee387860b9f88819887454644b475ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -214,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1b3e2ee0d83629e84e64f0429d9df8fe6c2b8d8df1cce7870afde605f4fd61ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x44abd407abc0300a3b5f84b87605937da7a6d040318d34f7bb26da677cea3135",
+        "lastblockhash" : "0xfa5af65b4e00f0e0c1b5000f651c562a1046e74fa51e0e7718c8e66498a52345",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -299,312 +299,13 @@
             }
         }
     },
-    "callcodecallcallcode_101_OOGMAfter_3_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "d179cb048b887cbcf12edb5c43000ee16e22cbb64c14bdc31f738a22238dd64a"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0155fa",
-                    "hash" : "0x89f2cef36fd6cb314513fcbc8103a434d9f7d7e6629ef06552eafb2a36029f54",
-                    "mixHash" : "0x9ee5f48921e6d4f6786ae75a8e71933e92ddab9e1e1ed4a313c01ecb6ec229ea",
-                    "nonce" : "0x1a8ef060e3e2b316",
-                    "number" : "0x01",
-                    "parentHash" : "0x2ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512be",
-                    "receiptTrie" : "0x9afc32c9268c7f1654ad4d462857d898cf830ad541a88890f9b514e8c93813aa",
-                    "stateRoot" : "0x1e9534f8fbf73e256ac03b54feb61c3c932364dab0a60b30b9566e7e8ce080ad",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a02ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01e9534f8fbf73e256ac03b54feb61c3c932364dab0a60b30b9566e7e8ce080ada0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09afc32c9268c7f1654ad4d462857d898cf830ad541a88890f9b514e8c93813aab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fa8203e880a09ee5f48921e6d4f6786ae75a8e71933e92ddab9e1e1ed4a313c01ecb6ec229ea881a8ef060e3e2b316f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x89f2cef36fd6cb314513fcbc8103a434d9f7d7e6629ef06552eafb2a36029f54",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : {
-            "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_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "d179cb048b887cbcf12edb5c43000ee16e22cbb64c14bdc31f738a22238dd64a"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x029fe0",
-                    "hash" : "0xfc5d2e2fdfa552715c987e09557d85f0afdd7125b6eda919ac0d57f9a0f64ee8",
-                    "mixHash" : "0x2472a5de8da5710b77bd432d6e65b30e83df4508a40387f0aa4fd68d34005479",
-                    "nonce" : "0xff2b19dddeb6ff7f",
-                    "number" : "0x01",
-                    "parentHash" : "0x2ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512be",
-                    "receiptTrie" : "0x65351559b0343f656ee81bb0eb21256b6886ad6b68f0378223d3e14bb5566db7",
-                    "stateRoot" : "0xcd311d29d93f911559d4302751ccc79023fdf08ebbd5857112fa38cfcb68bddb",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a02ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cd311d29d93f911559d4302751ccc79023fdf08ebbd5857112fa38cfcb68bddba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea065351559b0343f656ee81bb0eb21256b6886ad6b68f0378223d3e14bb5566db7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a02472a5de8da5710b77bd432d6e65b30e83df4508a40387f0aa4fd68d3400547988ff2b19dddeb6ff7ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0xfc5d2e2fdfa552715c987e09557d85f0afdd7125b6eda919ac0d57f9a0f64ee8",
-        "network" : "Frontier",
-        "postState" : {
-            "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" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f69fe0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7616020",
-                "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_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "d179cb048b887cbcf12edb5c43000ee16e22cbb64c14bdc31f738a22238dd64a"
+            "sourceHash" : "8c6a76c1fd38b2b27e6609074b01893079362f6e4a0a8e4f8fcf048889f16342"
         },
         "blocks" : [
             {
@@ -615,9 +316,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150c9",
-                    "hash" : "0xd7f1827014d19c8002db311e3fc08269e173e6bb8f006c44bdb7c7fd7ed2d405",
-                    "mixHash" : "0x9bca3d1021cac2581e8a42d2df6cd3a1edded040b8a94a31cdf9e5abb3ea4bd2",
-                    "nonce" : "0xe3fc5a46711a2249",
+                    "hash" : "0x643f51cf9bad03d4cdf67363212aa5a6a057450bd9153b60786a3d5d31845184",
+                    "mixHash" : "0x85c77dc68a1fda8bce28bd3cb00167ef7ba7c08db221ca77804c2eba896e5082",
+                    "nonce" : "0xc9a130c422345567",
                     "number" : "0x01",
                     "parentHash" : "0x2ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512be",
                     "receiptTrie" : "0xfd79d5239586bfadf7bc3e424a2e1c0d6c9b8b29fb24aa835329e05d38de6beb",
@@ -626,10 +327,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a02ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fbacbeed8fef433fd65da12f682e0d251262ae903b7af6d4073fe040d507e3ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fd79d5239586bfadf7bc3e424a2e1c0d6c9b8b29fb24aa835329e05d38de6bebb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c98203e880a09bca3d1021cac2581e8a42d2df6cd3a1edded040b8a94a31cdf9e5abb3ea4bd288e3fc5a46711a2249f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a02ea4b30225a0552a88c767cf66cf8b8043962af00eda28f99a67a266c4d512bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00fbacbeed8fef433fd65da12f682e0d251262ae903b7af6d4073fe040d507e3ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fd79d5239586bfadf7bc3e424a2e1c0d6c9b8b29fb24aa835329e05d38de6bebb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c98203e880a085c77dc68a1fda8bce28bd3cb00167ef7ba7c08db221ca77804c2eba896e508288c9a130c422345567f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -663,7 +364,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c1b3e2ee0d83629e84e64f0429d9df8fe6c2b8d8df1cce7870afde605f4fd61ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd7f1827014d19c8002db311e3fc08269e173e6bb8f006c44bdb7c7fd7ed2d405",
+        "lastblockhash" : "0x643f51cf9bad03d4cdf67363212aa5a6a057450bd9153b60786a3d5d31845184",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1_d0g0v0.json
index 4646259f3..64944cd7f 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_OOGMAfter_1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "8135c0ff7cb2c58a8acdf2fcfc53d35d0c920c0c2db0961c68373f6c6f3333f6"
+            "sourceHash" : "18c29fb9b46fce0ce1fa5fdc0338a09ae17a1fcecaad475679337e0450dae75e"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fc",
-                    "hash" : "0x4ca5790492a65780641747491d2aa963aabca43363e370cc6f75f073bd5ce180",
-                    "mixHash" : "0xe09132c3d775a034c238162baa4d229f2d0e643130a4a95274f1fea34438efc8",
-                    "nonce" : "0xe047a7abd0f11a34",
+                    "hash" : "0xd5e7d28063ea60f20a11d66a220c2e79a083adcf91e6472400ff6949f10bb18d",
+                    "mixHash" : "0x5ecf2d41a87b4c2a825925d467a2a7ca2ca399c9f4e433526e2b7103291fe9df",
+                    "nonce" : "0x95791b97b93b0584",
                     "number" : "0x01",
                     "parentHash" : "0xe7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cd",
                     "receiptTrie" : "0xadfbfdd0bb92dc004bc3dde08ce5b3aeada0bb5a50c9cc31aef4728f50fa6047",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032d85ac5c2b2bdf7a6a8d0853787c94933ec1a1d4046924ff1dbd0652d4473eba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0adfbfdd0bb92dc004bc3dde08ce5b3aeada0bb5a50c9cc31aef4728f50fa6047b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fc8203e880a0e09132c3d775a034c238162baa4d229f2d0e643130a4a95274f1fea34438efc888e047a7abd0f11a34f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0e7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032d85ac5c2b2bdf7a6a8d0853787c94933ec1a1d4046924ff1dbd0652d4473eba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0adfbfdd0bb92dc004bc3dde08ce5b3aeada0bb5a50c9cc31aef4728f50fa6047b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fc8203e880a05ecf2d41a87b4c2a825925d467a2a7ca2ca399c9f4e433526e2b7103291fe9df8895791b97b93b0584f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00777b1de84fbc82ba1a400a21de5411568c963ed24f7f4b3b98811bcf38029fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4ca5790492a65780641747491d2aa963aabca43363e370cc6f75f073bd5ce180",
+        "lastblockhash" : "0xd5e7d28063ea60f20a11d66a220c2e79a083adcf91e6472400ff6949f10bb18d",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -152,10 +152,10 @@
     "callcodecallcodecall_110_OOGMAfter_1_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "8135c0ff7cb2c58a8acdf2fcfc53d35d0c920c0c2db0961c68373f6c6f3333f6"
+            "sourceHash" : "18c29fb9b46fce0ce1fa5fdc0338a09ae17a1fcecaad475679337e0450dae75e"
         },
         "blocks" : [
             {
@@ -166,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fc",
-                    "hash" : "0x1f943595acd686db9a7bc574e24ed0b808a63333b988ec6a82655a111a6414fc",
-                    "mixHash" : "0x91bfa5295a94ec40b3e81674e9957ecc22f67e528b4091764060ab607e2e2224",
-                    "nonce" : "0xf1e6f1b8a3f2cd2b",
+                    "hash" : "0x3ee885c8168fb3ee417108645d44843c9621ba54ac738335ab2ff0732abf85e2",
+                    "mixHash" : "0x80efb653fba5c88ba7843fb549a8f4709a387c825fd9c6e37241cc16c8202d85",
+                    "nonce" : "0x6edbc5af850a5a77",
                     "number" : "0x01",
                     "parentHash" : "0xe7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cd",
                     "receiptTrie" : "0x97801756c9427bd2cd37ffc50bb252a2df3007a9eefc02179d701a16a8097ad2",
@@ -177,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e49c1496075bee37dc339ead53d7fdf2f0caa5e9bb991363c9a74c7c80e544c3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea097801756c9427bd2cd37ffc50bb252a2df3007a9eefc02179d701a16a8097ad2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fc8203e880a091bfa5295a94ec40b3e81674e9957ecc22f67e528b4091764060ab607e2e222488f1e6f1b8a3f2cd2bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0e7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e49c1496075bee37dc339ead53d7fdf2f0caa5e9bb991363c9a74c7c80e544c3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea097801756c9427bd2cd37ffc50bb252a2df3007a9eefc02179d701a16a8097ad2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fc8203e880a080efb653fba5c88ba7843fb549a8f4709a387c825fd9c6e37241cc16c8202d85886edbc5af850a5a77f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -214,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00777b1de84fbc82ba1a400a21de5411568c963ed24f7f4b3b98811bcf38029fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1f943595acd686db9a7bc574e24ed0b808a63333b988ec6a82655a111a6414fc",
+        "lastblockhash" : "0x3ee885c8168fb3ee417108645d44843c9621ba54ac738335ab2ff0732abf85e2",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -299,312 +299,13 @@
             }
         }
     },
-    "callcodecallcodecall_110_OOGMAfter_1_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "8135c0ff7cb2c58a8acdf2fcfc53d35d0c920c0c2db0961c68373f6c6f3333f6"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0155fc",
-                    "hash" : "0x447a7198a01f22ed7df0cc752b1dc5521358c535bc29ddadf1143ac94f4ee626",
-                    "mixHash" : "0xc7f305b2c4683f277d870e8526c310fe60016bc3231add9695e4f33713e711c5",
-                    "nonce" : "0x46da6952be7d246b",
-                    "number" : "0x01",
-                    "parentHash" : "0xe7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cd",
-                    "receiptTrie" : "0x97801756c9427bd2cd37ffc50bb252a2df3007a9eefc02179d701a16a8097ad2",
-                    "stateRoot" : "0xe49c1496075bee37dc339ead53d7fdf2f0caa5e9bb991363c9a74c7c80e544c3",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0e7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e49c1496075bee37dc339ead53d7fdf2f0caa5e9bb991363c9a74c7c80e544c3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea097801756c9427bd2cd37ffc50bb252a2df3007a9eefc02179d701a16a8097ad2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fc8203e880a0c7f305b2c4683f277d870e8526c310fe60016bc3231add9695e4f33713e711c58846da6952be7d246bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x447a7198a01f22ed7df0cc752b1dc5521358c535bc29ddadf1143ac94f4ee626",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : {
-            "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_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "8135c0ff7cb2c58a8acdf2fcfc53d35d0c920c0c2db0961c68373f6c6f3333f6"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x029fe0",
-                    "hash" : "0xaefa289876488048a329cbbf6353b5a9b9f407cb1c6e953fc47265becada78d6",
-                    "mixHash" : "0x22c5fac777313ab7b99549a2f3b40ad465ef60a2b66a58d0ef9f296fe6467f23",
-                    "nonce" : "0x3dcda23bc72505fe",
-                    "number" : "0x01",
-                    "parentHash" : "0xe7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cd",
-                    "receiptTrie" : "0x80b44799302b8e9d406aa6bd1202e2a96199ffd759b95a49361594c13b5d256c",
-                    "stateRoot" : "0xf3729207adab5a1c3e8b052adc4d30c2c9ca7e84246825ce7879160d0d6f4626",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0e7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3729207adab5a1c3e8b052adc4d30c2c9ca7e84246825ce7879160d0d6f4626a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea080b44799302b8e9d406aa6bd1202e2a96199ffd759b95a49361594c13b5d256cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a022c5fac777313ab7b99549a2f3b40ad465ef60a2b66a58d0ef9f296fe6467f23883dcda23bc72505fef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0xaefa289876488048a329cbbf6353b5a9b9f407cb1c6e953fc47265becada78d6",
-        "network" : "Frontier",
-        "postState" : {
-            "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" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f69fe0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7616020",
-                "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_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "8135c0ff7cb2c58a8acdf2fcfc53d35d0c920c0c2db0961c68373f6c6f3333f6"
+            "sourceHash" : "18c29fb9b46fce0ce1fa5fdc0338a09ae17a1fcecaad475679337e0450dae75e"
         },
         "blocks" : [
             {
@@ -615,9 +316,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150c9",
-                    "hash" : "0x4e1bfaf3cc913955101f33c85ea19b83cae30310820068e55888eb2ad618c996",
-                    "mixHash" : "0x3381607c16c53a12b630f14c4f40d3352dedb28882e7eb167993a89e97bc6add",
-                    "nonce" : "0xa477385c4cebb67c",
+                    "hash" : "0xe6c654e24a304c92bf1b07360a72cbd95654442c5214e168c321aa29679d9e0e",
+                    "mixHash" : "0x5b5de0b41b0f2bc66cec0b1ba5c400be1b752ef1653c5b99d9dd60423efd093f",
+                    "nonce" : "0xad2ef9d67c791348",
                     "number" : "0x01",
                     "parentHash" : "0xe7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cd",
                     "receiptTrie" : "0xf2f8201d3954a240d39c5748d71ba574f27fe834598c581bf765799894b15aa3",
@@ -626,10 +327,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0e7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa071ad194e1cc957eb5150251f51fe7b1a85c113f1c0087b084968b533dd38e464a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f2f8201d3954a240d39c5748d71ba574f27fe834598c581bf765799894b15aa3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c98203e880a03381607c16c53a12b630f14c4f40d3352dedb28882e7eb167993a89e97bc6add88a477385c4cebb67cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0e7c31e88e4571db8f87b1ec6f177f73eea07b935412560448fa44ee41cb620cda01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa071ad194e1cc957eb5150251f51fe7b1a85c113f1c0087b084968b533dd38e464a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f2f8201d3954a240d39c5748d71ba574f27fe834598c581bf765799894b15aa3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c98203e880a05b5de0b41b0f2bc66cec0b1ba5c400be1b752ef1653c5b99d9dd60423efd093f88ad2ef9d67c791348f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -663,7 +364,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00777b1de84fbc82ba1a400a21de5411568c963ed24f7f4b3b98811bcf38029fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4e1bfaf3cc913955101f33c85ea19b83cae30310820068e55888eb2ad618c996",
+        "lastblockhash" : "0xe6c654e24a304c92bf1b07360a72cbd95654442c5214e168c321aa29679d9e0e",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2_d0g0v0.json
index a243820d9..d286cbe3f 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_OOGMAfter_2_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "8f9a384a4f97ae8c95b37042b31d9c4b63566a6538d325493778e4a9117c9ab3"
+            "sourceHash" : "887fe285832b6b8e0c88bdea35372372a30a2cbcbdc5694f8556d70bad135430"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155f7",
-                    "hash" : "0x7e36c360176f1e13fa1a129ce99718858654db211168c708986f3ac77e01d041",
-                    "mixHash" : "0x287094180d7247947952d5aafe3d99b90c6da8407e645ae42157270a8e27b140",
-                    "nonce" : "0xc3200c96381b33b8",
+                    "hash" : "0xea9830177527eb1d397e126940693e97596fcc20ba8469e3ace966d78f239d6b",
+                    "mixHash" : "0xf939893b2754b9c091e572264d743e11b4b11e8336c6d67c42ac99a9545bb8eb",
+                    "nonce" : "0x75459233800be604",
                     "number" : "0x01",
                     "parentHash" : "0x11621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3",
                     "receiptTrie" : "0x7b32f6865ba11d16b4c8e757d35f80e1ea3ddb33d2b2fc644a01c5a2bbb5ba1f",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a011621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f9ecaf9cc297aebd235d38477bedf6dceada25af563b1d6c489634744274599a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07b32f6865ba11d16b4c8e757d35f80e1ea3ddb33d2b2fc644a01c5a2bbb5ba1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a0287094180d7247947952d5aafe3d99b90c6da8407e645ae42157270a8e27b14088c3200c96381b33b8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a011621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f9ecaf9cc297aebd235d38477bedf6dceada25af563b1d6c489634744274599a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07b32f6865ba11d16b4c8e757d35f80e1ea3ddb33d2b2fc644a01c5a2bbb5ba1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a0f939893b2754b9c091e572264d743e11b4b11e8336c6d67c42ac99a9545bb8eb8875459233800be604f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0952c78fad0fdbcb5d406ceb2e903a66c9f794e4da7512335b7dd4eb12bdd4282a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7e36c360176f1e13fa1a129ce99718858654db211168c708986f3ac77e01d041",
+        "lastblockhash" : "0xea9830177527eb1d397e126940693e97596fcc20ba8469e3ace966d78f239d6b",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -152,10 +152,10 @@
     "callcodecallcodecall_110_OOGMAfter_2_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "8f9a384a4f97ae8c95b37042b31d9c4b63566a6538d325493778e4a9117c9ab3"
+            "sourceHash" : "887fe285832b6b8e0c88bdea35372372a30a2cbcbdc5694f8556d70bad135430"
         },
         "blocks" : [
             {
@@ -166,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155f7",
-                    "hash" : "0x925c0d41f05ac5ee494488505fe4b7c794fa9f9ad6acbd6ffdef28107b7de2fa",
-                    "mixHash" : "0x596dafd9f6f76ea142e6daf549003bb20ea73e455c6a7af0efc681246a8cd044",
-                    "nonce" : "0xc4754f1fe3e222a1",
+                    "hash" : "0x6dd11ab2ca762ae7d544d0f845cc9f12c9bdb8747cdbbd2c637f3cd072fa3132",
+                    "mixHash" : "0xdc35fe1fde2c5aeb8d1465b12d64ef124911892df91048a521c7ce0025bd158b",
+                    "nonce" : "0xc40393b1a76ff63d",
                     "number" : "0x01",
                     "parentHash" : "0x11621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3",
                     "receiptTrie" : "0x0a50a9b49e2f1295fe83a53ebd32cba572413b0219e84c5a1a2a4a0b38f2cdf1",
@@ -177,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a011621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0820a4a233608aa25d7751046aafd716a104389db4a36812c02eb5978debc5227a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00a50a9b49e2f1295fe83a53ebd32cba572413b0219e84c5a1a2a4a0b38f2cdf1b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a0596dafd9f6f76ea142e6daf549003bb20ea73e455c6a7af0efc681246a8cd04488c4754f1fe3e222a1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a011621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0820a4a233608aa25d7751046aafd716a104389db4a36812c02eb5978debc5227a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00a50a9b49e2f1295fe83a53ebd32cba572413b0219e84c5a1a2a4a0b38f2cdf1b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a0dc35fe1fde2c5aeb8d1465b12d64ef124911892df91048a521c7ce0025bd158b88c40393b1a76ff63df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -214,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0952c78fad0fdbcb5d406ceb2e903a66c9f794e4da7512335b7dd4eb12bdd4282a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x925c0d41f05ac5ee494488505fe4b7c794fa9f9ad6acbd6ffdef28107b7de2fa",
+        "lastblockhash" : "0x6dd11ab2ca762ae7d544d0f845cc9f12c9bdb8747cdbbd2c637f3cd072fa3132",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -299,312 +299,13 @@
             }
         }
     },
-    "callcodecallcodecall_110_OOGMAfter_2_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "8f9a384a4f97ae8c95b37042b31d9c4b63566a6538d325493778e4a9117c9ab3"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0155f7",
-                    "hash" : "0xa0b924152565301932b8056da4bd172dae893ecf7dcc17f6021df7ae65a26ef5",
-                    "mixHash" : "0x6198a25bacfca6c79ad7da777509b5c1bbf269a273332c2267afccb5265a26cb",
-                    "nonce" : "0xdffde52dda38cfc2",
-                    "number" : "0x01",
-                    "parentHash" : "0x11621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3",
-                    "receiptTrie" : "0x0a50a9b49e2f1295fe83a53ebd32cba572413b0219e84c5a1a2a4a0b38f2cdf1",
-                    "stateRoot" : "0x820a4a233608aa25d7751046aafd716a104389db4a36812c02eb5978debc5227",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a011621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0820a4a233608aa25d7751046aafd716a104389db4a36812c02eb5978debc5227a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00a50a9b49e2f1295fe83a53ebd32cba572413b0219e84c5a1a2a4a0b38f2cdf1b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a06198a25bacfca6c79ad7da777509b5c1bbf269a273332c2267afccb5265a26cb88dffde52dda38cfc2f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0xa0b924152565301932b8056da4bd172dae893ecf7dcc17f6021df7ae65a26ef5",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : {
-            "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_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "8f9a384a4f97ae8c95b37042b31d9c4b63566a6538d325493778e4a9117c9ab3"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x029fe0",
-                    "hash" : "0x6ec77b2733ab232b6716789425dc8492ffe2ca9164ed5c9dcac6f08cf14e6e47",
-                    "mixHash" : "0x2af6fa6d74e27938d0f63a43c8b0828410bfeb1490cc46599e95afb832ca1dd5",
-                    "nonce" : "0x889b8a40761d2136",
-                    "number" : "0x01",
-                    "parentHash" : "0x11621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3",
-                    "receiptTrie" : "0xf48f3a07ce86db2260e5038d3beabc54a346961ffe653186cb4f3e79de9effc3",
-                    "stateRoot" : "0x86c0dccc82f128c00d9fbffd98203b5ee541fa97663abf60545c47d706e020a6",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a011621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086c0dccc82f128c00d9fbffd98203b5ee541fa97663abf60545c47d706e020a6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f48f3a07ce86db2260e5038d3beabc54a346961ffe653186cb4f3e79de9effc3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a02af6fa6d74e27938d0f63a43c8b0828410bfeb1490cc46599e95afb832ca1dd588889b8a40761d2136f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x6ec77b2733ab232b6716789425dc8492ffe2ca9164ed5c9dcac6f08cf14e6e47",
-        "network" : "Frontier",
-        "postState" : {
-            "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" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f69fe0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7616020",
-                "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_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "8f9a384a4f97ae8c95b37042b31d9c4b63566a6538d325493778e4a9117c9ab3"
+            "sourceHash" : "887fe285832b6b8e0c88bdea35372372a30a2cbcbdc5694f8556d70bad135430"
         },
         "blocks" : [
             {
@@ -615,9 +316,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150c9",
-                    "hash" : "0x043ea5271695d401b3a8d3057837fabf843e1857664fc3366f5bbd64720e6a31",
-                    "mixHash" : "0xb4676e82f535eea40ffac7f8b130725a4b08e25c4441cb988c461b2a7979f6bc",
-                    "nonce" : "0x0a05e15448086afe",
+                    "hash" : "0x245cee2770cd4c2399501a0e6049151906985d6164fda35d0ca310d928bb47a9",
+                    "mixHash" : "0xa01c7946311d035ce1057bac18b3cec3f90b5f0817f2d1a5e0195e3c6780d6f6",
+                    "nonce" : "0x4bc8994cafa00d53",
                     "number" : "0x01",
                     "parentHash" : "0x11621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3",
                     "receiptTrie" : "0xd5913ee69adde1b3cad1793bfaee2cbcd404942addba5d6c8c168d3a6cae8b07",
@@ -626,10 +327,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a011621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e6a32b7bf776acbd08e9eb0cfd31c5696cf6731b39613483e972099ce3157738a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0d5913ee69adde1b3cad1793bfaee2cbcd404942addba5d6c8c168d3a6cae8b07b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c98203e880a0b4676e82f535eea40ffac7f8b130725a4b08e25c4441cb988c461b2a7979f6bc880a05e15448086afef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a011621c747c872950da011e5477f6ab1f4668218381b9c7aaf65e36ac4d5a12f3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e6a32b7bf776acbd08e9eb0cfd31c5696cf6731b39613483e972099ce3157738a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0d5913ee69adde1b3cad1793bfaee2cbcd404942addba5d6c8c168d3a6cae8b07b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150c98203e880a0a01c7946311d035ce1057bac18b3cec3f90b5f0817f2d1a5e0195e3c6780d6f6884bc8994cafa00d53f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -663,7 +364,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0952c78fad0fdbcb5d406ceb2e903a66c9f794e4da7512335b7dd4eb12bdd4282a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x043ea5271695d401b3a8d3057837fabf843e1857664fc3366f5bbd64720e6a31",
+        "lastblockhash" : "0x245cee2770cd4c2399501a0e6049151906985d6164fda35d0ca310d928bb47a9",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3_d0g0v0.json
index eb42bc4d3..3d18f8c6c 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_OOGMAfter_3_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "931f8251950d130c5b9ea026bb18ec8127b7ec5b42fdabeec97d653884cc7182"
+            "sourceHash" : "c6d5eb1c3e5e06bd57c9df3fd6db288ac317077d13c2f5ee63e6397ae5de5e43"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0x4b549a4bb2cb68e1bfc0996845f147b457ae09ae5216ca2fc11fe5ccd7c23e4a",
-                    "mixHash" : "0x155ed98aceb910053eea4b53e9e3354a50747cf46372c53dd47ec3eeb89edfc3",
-                    "nonce" : "0x0a667c70f6ed1a1d",
+                    "hash" : "0x953385d75c210a0b915c80304113d5bdcb5963f696763566255b5ad14b863e6e",
+                    "mixHash" : "0xcc73505bfef2e2e849cda9ee07890242c8229069459aced18f76a6197d5f1f4b",
+                    "nonce" : "0x04ceac182a4e616e",
                     "number" : "0x01",
                     "parentHash" : "0x17a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42",
                     "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a017a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8267c96f7767832699de85bc9c978c43f2578838d28df4175ba1780ba9e7b88a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0155ed98aceb910053eea4b53e9e3354a50747cf46372c53dd47ec3eeb89edfc3880a667c70f6ed1a1df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a017a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8267c96f7767832699de85bc9c978c43f2578838d28df4175ba1780ba9e7b88a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0cc73505bfef2e2e849cda9ee07890242c8229069459aced18f76a6197d5f1f4b8804ceac182a4e616ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4b549a4bb2cb68e1bfc0996845f147b457ae09ae5216ca2fc11fe5ccd7c23e4a",
+        "lastblockhash" : "0x953385d75c210a0b915c80304113d5bdcb5963f696763566255b5ad14b863e6e",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -152,10 +152,10 @@
     "callcodecallcodecall_110_OOGMAfter_3_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "931f8251950d130c5b9ea026bb18ec8127b7ec5b42fdabeec97d653884cc7182"
+            "sourceHash" : "c6d5eb1c3e5e06bd57c9df3fd6db288ac317077d13c2f5ee63e6397ae5de5e43"
         },
         "blocks" : [
             {
@@ -166,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0x905d99f756f2656238b2917b448a7618c895743f8f99025116240836f11fbdbe",
-                    "mixHash" : "0x203d3baccadedd4125e23c866c745e68832c67d9faed85106fc48e79cae120e9",
-                    "nonce" : "0x0a83e33c91d37120",
+                    "hash" : "0xba844eb35306c942ca1eace7f2553bfe9bae4201b691886aa8b1bbc6825d3c6d",
+                    "mixHash" : "0xcacf8eb1a9e6ff81737055dfb3d6e2bb256705f8d941e1ecb9ef205885c7bf7d",
+                    "nonce" : "0xadffe9ae2f2de016",
                     "number" : "0x01",
                     "parentHash" : "0x17a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42",
                     "receiptTrie" : "0x6d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6d",
@@ -177,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a017a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e571c7d40a6be752928e183d2c5e01af5098182cbcd066f4eff4aba0732f48a7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0203d3baccadedd4125e23c866c745e68832c67d9faed85106fc48e79cae120e9880a83e33c91d37120f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a017a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e571c7d40a6be752928e183d2c5e01af5098182cbcd066f4eff4aba0732f48a7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0cacf8eb1a9e6ff81737055dfb3d6e2bb256705f8d941e1ecb9ef205885c7bf7d88adffe9ae2f2de016f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -214,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x905d99f756f2656238b2917b448a7618c895743f8f99025116240836f11fbdbe",
+        "lastblockhash" : "0xba844eb35306c942ca1eace7f2553bfe9bae4201b691886aa8b1bbc6825d3c6d",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -299,312 +299,13 @@
             }
         }
     },
-    "callcodecallcodecall_110_OOGMAfter_3_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "931f8251950d130c5b9ea026bb18ec8127b7ec5b42fdabeec97d653884cc7182"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0155fd",
-                    "hash" : "0xb06675af1612d83b35aa42661ae3c03a1726b35b2cf55e91c03b8bd082916696",
-                    "mixHash" : "0xd44e0ea1496290dc12efe28704ddf4d64e09b7f449ee9db72b6ee7db7623c23b",
-                    "nonce" : "0xfa0bb9552967b148",
-                    "number" : "0x01",
-                    "parentHash" : "0x17a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42",
-                    "receiptTrie" : "0x6d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6d",
-                    "stateRoot" : "0xe571c7d40a6be752928e183d2c5e01af5098182cbcd066f4eff4aba0732f48a7",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a017a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e571c7d40a6be752928e183d2c5e01af5098182cbcd066f4eff4aba0732f48a7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d4572bb3c7343ab05f3253aba5bd9fbd3023b80a82a721b8aee49754c23cf6db9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0d44e0ea1496290dc12efe28704ddf4d64e09b7f449ee9db72b6ee7db7623c23b88fa0bb9552967b148f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0xb06675af1612d83b35aa42661ae3c03a1726b35b2cf55e91c03b8bd082916696",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : {
-            "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_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "931f8251950d130c5b9ea026bb18ec8127b7ec5b42fdabeec97d653884cc7182"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0150cc",
-                    "hash" : "0x836567194591f38590be516047be54d7545107ddb85b672127b7850dbf0f44d7",
-                    "mixHash" : "0xc82143bc4130df38ad91d764f5ded426f36a86319c7d190eaa14a47e631fb396",
-                    "nonce" : "0xb83811e3a3737b5e",
-                    "number" : "0x01",
-                    "parentHash" : "0x17a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42",
-                    "receiptTrie" : "0x5bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cf",
-                    "stateRoot" : "0x4f56f4f8e719cca3588659cdaab075ea86a2f718d5495d4bf1bf30611036a31a",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a017a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f56f4f8e719cca3588659cdaab075ea86a2f718d5495d4bf1bf30611036a31aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0c82143bc4130df38ad91d764f5ded426f36a86319c7d190eaa14a47e631fb39688b83811e3a3737b5ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x836567194591f38590be516047be54d7545107ddb85b672127b7850dbf0f44d7",
-        "network" : "Frontier",
-        "postState" : {
-            "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" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550cc",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af34",
-                "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_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "931f8251950d130c5b9ea026bb18ec8127b7ec5b42fdabeec97d653884cc7182"
+            "sourceHash" : "c6d5eb1c3e5e06bd57c9df3fd6db288ac317077d13c2f5ee63e6397ae5de5e43"
         },
         "blocks" : [
             {
@@ -615,9 +316,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0xf355df30a0bbf6687fbe82015b9468734cfc37c447cd83377c7e8a958275115e",
-                    "mixHash" : "0x268aed8b79106e7157ead0b642fea020284de5cb2bd7c4a0174362dda989c258",
-                    "nonce" : "0xa8f761299fc02043",
+                    "hash" : "0x9f5cdde8902ed1d6f63160bf11993a502f884f36d9b0ed3c2c36059869118c9a",
+                    "mixHash" : "0x5f9b3dd8889757444f3b8c8b6b20be9531eb6b5282e03025a7206057da05b471",
+                    "nonce" : "0xae4cc0cb6014bc8e",
                     "number" : "0x01",
                     "parentHash" : "0x17a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42",
                     "receiptTrie" : "0x5bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cf",
@@ -626,10 +327,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a017a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f56f4f8e719cca3588659cdaab075ea86a2f718d5495d4bf1bf30611036a31aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0268aed8b79106e7157ead0b642fea020284de5cb2bd7c4a0174362dda989c25888a8f761299fc02043f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a017a5b725e456629aecafd287734eb7384b11ba6ae56351b480a6b493122d8e42a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f56f4f8e719cca3588659cdaab075ea86a2f718d5495d4bf1bf30611036a31aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05bee94f4d1c33fa5318bdafa0b54c0de210979b8c9411bbcfcb330c6906850cfb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a05f9b3dd8889757444f3b8c8b6b20be9531eb6b5282e03025a7206057da05b47188ae4cc0cb6014bc8ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -663,7 +364,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa028dc051428578aed6c7ad958c6acf94a3131c26eb2edae76449ba3d61894976fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf355df30a0bbf6687fbe82015b9468734cfc37c447cd83377c7e8a958275115e",
+        "lastblockhash" : "0x9f5cdde8902ed1d6f63160bf11993a502f884f36d9b0ed3c2c36059869118c9a",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0.json
index 72a4b1aed..aa6ddd09c 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "932b1ed3b36a2c0167141dccfef338c275fcc6fe2e19c793a9f7b89322163d5a"
+            "sourceHash" : "ce3b3a583a63a94a32b8b71c6b8b6d3fda0bb673ee1ed733fbfddf59e1e01006"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015353",
-                    "hash" : "0x688928a85c6c87e5aa3868ade2a3397b04a0bac3ab4167584eb3339c6d51a1a1",
-                    "mixHash" : "0xcc9c07fdc1488dba90881e40e5a48bb031d973cf88d19876a18d61ad6deb18a1",
-                    "nonce" : "0x32ef97ff2d29f062",
+                    "hash" : "0x6eb0eadebf0f44568b702c37084288f4247924f0b94a26226c715051c5fdefe8",
+                    "mixHash" : "0x220516a17f651904c7eb9d254440c115f1c6ab704a7d986bae5324bbfd1f705b",
+                    "nonce" : "0x2f0da136be35d62d",
                     "number" : "0x01",
                     "parentHash" : "0x876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6",
                     "receiptTrie" : "0x894bd6e47e0d8ea83d5b6425be380261794ae8c4b6338023903ea8b47172ccf1",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c0844c47ce32eb3bd4cf463b8b933a3d367e6a54c8f4435c82499db842cd866fa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0894bd6e47e0d8ea83d5b6425be380261794ae8c4b6338023903ea8b47172ccf1b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153538203e880a0cc9c07fdc1488dba90881e40e5a48bb031d973cf88d19876a18d61ad6deb18a18832ef97ff2d29f062f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c0844c47ce32eb3bd4cf463b8b933a3d367e6a54c8f4435c82499db842cd866fa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0894bd6e47e0d8ea83d5b6425be380261794ae8c4b6338023903ea8b47172ccf1b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153538203e880a0220516a17f651904c7eb9d254440c115f1c6ab704a7d986bae5324bbfd1f705b882f0da136be35d62df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f01031bc9caf27ec528a569c75eb29d01d474cc49e5a5ebfc189fbb72f31e6c7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x688928a85c6c87e5aa3868ade2a3397b04a0bac3ab4167584eb3339c6d51a1a1",
+        "lastblockhash" : "0x6eb0eadebf0f44568b702c37084288f4247924f0b94a26226c715051c5fdefe8",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -151,10 +151,10 @@
     "callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "932b1ed3b36a2c0167141dccfef338c275fcc6fe2e19c793a9f7b89322163d5a"
+            "sourceHash" : "ce3b3a583a63a94a32b8b71c6b8b6d3fda0bb673ee1ed733fbfddf59e1e01006"
         },
         "blocks" : [
             {
@@ -165,9 +165,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x015353",
-                    "hash" : "0x7ce5819259079a3e750105c2c9049625624cce569f8ecd1b0d11a7d930fd53fc",
-                    "mixHash" : "0x5f94c4e25e7f94200b7f58d61ccf8d2e5f4487bd6febf53075436acf1f03fd89",
-                    "nonce" : "0xd2292c59b78c7926",
+                    "hash" : "0x33e22098f8ab120dc28665685e0cf519f58aa811fbad82c51e77cc73f7f5ac12",
+                    "mixHash" : "0x44c21d0d48366083d1fae0045f5d0ff2de0758f13fc96c05ab644d3d864b8b30",
+                    "nonce" : "0xfd81a54a9cba0bef",
                     "number" : "0x01",
                     "parentHash" : "0x876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6",
                     "receiptTrie" : "0x2d34e6c0b0ed7ef6d6dbe1c3a389c31dc9ea2fd1fd4b9a7349993937007ab534",
@@ -176,10 +176,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ef9def5a0e85c477bc330f94e254dff880bce95d5f0e55eac5cf8d534b8c82ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02d34e6c0b0ed7ef6d6dbe1c3a389c31dc9ea2fd1fd4b9a7349993937007ab534b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153538203e880a05f94c4e25e7f94200b7f58d61ccf8d2e5f4487bd6febf53075436acf1f03fd8988d2292c59b78c7926f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ef9def5a0e85c477bc330f94e254dff880bce95d5f0e55eac5cf8d534b8c82ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02d34e6c0b0ed7ef6d6dbe1c3a389c31dc9ea2fd1fd4b9a7349993937007ab534b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153538203e880a044c21d0d48366083d1fae0045f5d0ff2de0758f13fc96c05ab644d3d864b8b3088fd81a54a9cba0beff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -213,7 +213,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f01031bc9caf27ec528a569c75eb29d01d474cc49e5a5ebfc189fbb72f31e6c7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7ce5819259079a3e750105c2c9049625624cce569f8ecd1b0d11a7d930fd53fc",
+        "lastblockhash" : "0x33e22098f8ab120dc28665685e0cf519f58aa811fbad82c51e77cc73f7f5ac12",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -297,311 +297,13 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "932b1ed3b36a2c0167141dccfef338c275fcc6fe2e19c793a9f7b89322163d5a"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x015353",
-                    "hash" : "0xb2cc9c9c3d6c7ce83d03a853883abec9b657857806bfc7ba18b86b4dacd74de4",
-                    "mixHash" : "0x04ef2703f9a2874aee04d8ec711b45b58e8dbdef670cb7197caeebf14da9521a",
-                    "nonce" : "0x3a5e765efebb2db1",
-                    "number" : "0x01",
-                    "parentHash" : "0x876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6",
-                    "receiptTrie" : "0x2d34e6c0b0ed7ef6d6dbe1c3a389c31dc9ea2fd1fd4b9a7349993937007ab534",
-                    "stateRoot" : "0x5ef9def5a0e85c477bc330f94e254dff880bce95d5f0e55eac5cf8d534b8c82c",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05ef9def5a0e85c477bc330f94e254dff880bce95d5f0e55eac5cf8d534b8c82ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02d34e6c0b0ed7ef6d6dbe1c3a389c31dc9ea2fd1fd4b9a7349993937007ab534b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830153538203e880a004ef2703f9a2874aee04d8ec711b45b58e8dbdef670cb7197caeebf14da9521a883a5e765efebb2db1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0xb2cc9c9c3d6c7ce83d03a853883abec9b657857806bfc7ba18b86b4dacd74de4",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : {
-            "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_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "932b1ed3b36a2c0167141dccfef338c275fcc6fe2e19c793a9f7b89322163d5a"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x029fe0",
-                    "hash" : "0x896f5e0532dfa5cbed02ffe6cd6167cd5026972e7c28df1351d35c0336a73425",
-                    "mixHash" : "0x7321c7b78f9d3869b8714a826a071e0edd04e516d412dc670fa11bbfa8b843a3",
-                    "nonce" : "0x43f002a64160df7a",
-                    "number" : "0x01",
-                    "parentHash" : "0x876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6",
-                    "receiptTrie" : "0xf760ac403e2f0b3b2dcb7c2c9bf0c5c699070f320dd0c6e4f9f0344abcbfa8aa",
-                    "stateRoot" : "0x4092a1c83442e6a929a2510230d2c10092609f6299ade0aad8543d8ddd8d30ba",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04092a1c83442e6a929a2510230d2c10092609f6299ade0aad8543d8ddd8d30baa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f760ac403e2f0b3b2dcb7c2c9bf0c5c699070f320dd0c6e4f9f0344abcbfa8aab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a07321c7b78f9d3869b8714a826a071e0edd04e516d412dc670fa11bbfa8b843a38843f002a64160df7af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x896f5e0532dfa5cbed02ffe6cd6167cd5026972e7c28df1351d35c0336a73425",
-        "network" : "Frontier",
-        "postState" : {
-            "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" : "0x4563918244f69fe0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7616020",
-                "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_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0Filler.json",
-            "sourceHash" : "932b1ed3b36a2c0167141dccfef338c275fcc6fe2e19c793a9f7b89322163d5a"
+            "sourceHash" : "ce3b3a583a63a94a32b8b71c6b8b6d3fda0bb673ee1ed733fbfddf59e1e01006"
         },
         "blocks" : [
             {
@@ -612,9 +314,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150bf",
-                    "hash" : "0xf62d8f85e876f31a2f591b8584ea83cb3178a2f58af90ceb6fe67a65d14bb216",
-                    "mixHash" : "0xd90977d1214532d65daf2f4adbda8b045998eb48c5f401290996c42de867654d",
-                    "nonce" : "0x1a57f554fe77a321",
+                    "hash" : "0x67cbca5d47d54d7dd8117b7be536a43fc59b9be7b75902644d67ca14ca3d359b",
+                    "mixHash" : "0x71bfe5b25aa5d56d51d2cbee9b8a558a3ff0f90d4f05b8d0719520f8e5398f71",
+                    "nonce" : "0x98378b6b6cf79423",
                     "number" : "0x01",
                     "parentHash" : "0x876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6",
                     "receiptTrie" : "0xfa89c3e8f07ff91dd1b12032df09055de00297ccc8d10b67a1b1ea45e12442c3",
@@ -623,10 +325,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c76794cb5b0c7e2a715485dd1886cc2c5965e05cbfd35cfa881b5e2ea149eec5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fa89c3e8f07ff91dd1b12032df09055de00297ccc8d10b67a1b1ea45e12442c3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150bf8203e880a0d90977d1214532d65daf2f4adbda8b045998eb48c5f401290996c42de867654d881a57f554fe77a321f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a0876e3e46457814bee64ea37d4c8e928ae82fe5b8e20ec48e4c3a2ecc9d9bfef6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c76794cb5b0c7e2a715485dd1886cc2c5965e05cbfd35cfa881b5e2ea149eec5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fa89c3e8f07ff91dd1b12032df09055de00297ccc8d10b67a1b1ea45e12442c3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150bf8203e880a071bfe5b25aa5d56d51d2cbee9b8a558a3ff0f90d4f05b8d0719520f8e5398f718898378b6b6cf79423f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -660,7 +362,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f01031bc9caf27ec528a569c75eb29d01d474cc49e5a5ebfc189fbb72f31e6c7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf62d8f85e876f31a2f591b8584ea83cb3178a2f58af90ceb6fe67a65d14bb216",
+        "lastblockhash" : "0x67cbca5d47d54d7dd8117b7be536a43fc59b9be7b75902644d67ca14ca3d359b",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0.json
index d1be32e68..254517657 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "bee77ff6d24414d1ab847eb784233d6e67b3fe04319084a991a5dd0a9fe59a94"
+            "sourceHash" : "a1c485300e5a23f9cc3b6f5fa33937e1122b80a9db3cbf914e10f0804b65f386"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01560b",
-                    "hash" : "0x63d868f82eb710fdb829fc4a23ffcd0d25354700708d8772eca0401d577c3f73",
-                    "mixHash" : "0x6badc164cf1657860077aa2be54f7ff743c36d04988767692f8304699b61b182",
-                    "nonce" : "0x320db173e70360a8",
+                    "hash" : "0x7dc6bf78df7cb057a0e4ece3aeed30e3bdfef116b34faacd31be034b914e78c2",
+                    "mixHash" : "0xe64423a0ba69f7fa5f18f37ab4b8183ba0a0387112331e2fec2222226bbfd5b5",
+                    "nonce" : "0xc536eeea1f9aff3a",
                     "number" : "0x01",
                     "parentHash" : "0x7521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364",
                     "receiptTrie" : "0x1926df3be5c4905a6dff93b7431c5c79da9a1aab9889f3fee59e1296ef7a6bd9",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e368cc98f890e8a3cc121f8a7dc7dec8a1e4388e425dc56dac927d328f356eaa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea01926df3be5c4905a6dff93b7431c5c79da9a1aab9889f3fee59e1296ef7a6bd9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301560b8203e880a06badc164cf1657860077aa2be54f7ff743c36d04988767692f8304699b61b18288320db173e70360a8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a07521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e368cc98f890e8a3cc121f8a7dc7dec8a1e4388e425dc56dac927d328f356eaa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea01926df3be5c4905a6dff93b7431c5c79da9a1aab9889f3fee59e1296ef7a6bd9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301560b8203e880a0e64423a0ba69f7fa5f18f37ab4b8183ba0a0387112331e2fec2222226bbfd5b588c536eeea1f9aff3af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a620ff51bda7f6ba28747f1155da8e9462da1c6f9d3d0eb33637881639984f0aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x63d868f82eb710fdb829fc4a23ffcd0d25354700708d8772eca0401d577c3f73",
+        "lastblockhash" : "0x7dc6bf78df7cb057a0e4ece3aeed30e3bdfef116b34faacd31be034b914e78c2",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -152,10 +152,10 @@
     "callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "bee77ff6d24414d1ab847eb784233d6e67b3fe04319084a991a5dd0a9fe59a94"
+            "sourceHash" : "a1c485300e5a23f9cc3b6f5fa33937e1122b80a9db3cbf914e10f0804b65f386"
         },
         "blocks" : [
             {
@@ -166,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x01560b",
-                    "hash" : "0xab00e651d5c70b7e9ec18e2fd361983faa0c07625af710bb6a25f4d1e1375167",
-                    "mixHash" : "0xffc85a0b1f59edd373956c1a4e1a9adf0fe50f2476a6d1abb1fc5a5317410fe0",
-                    "nonce" : "0x70e04bf24b05960a",
+                    "hash" : "0x2dacdbc13fea0203f4bb9ce7bdc24da8059d10e3c7e2f48ed2942d4386ae4dc6",
+                    "mixHash" : "0x1ae3baad61a8af5c880ee646d1e62a2ea4557d5b21151fd280e6ffe26687797a",
+                    "nonce" : "0xde5a99ef137fe07b",
                     "number" : "0x01",
                     "parentHash" : "0x7521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364",
                     "receiptTrie" : "0x5db0c4a2708aba30824d95a97638a0cdc1cc932b033879315f14e1a66d4f5f69",
@@ -177,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd3096fd913fee9e9e32eb6245614fc74ea9ecba135097023185aa53d21f019ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05db0c4a2708aba30824d95a97638a0cdc1cc932b033879315f14e1a66d4f5f69b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301560b8203e880a0ffc85a0b1f59edd373956c1a4e1a9adf0fe50f2476a6d1abb1fc5a5317410fe08870e04bf24b05960af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a07521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd3096fd913fee9e9e32eb6245614fc74ea9ecba135097023185aa53d21f019ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05db0c4a2708aba30824d95a97638a0cdc1cc932b033879315f14e1a66d4f5f69b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301560b8203e880a01ae3baad61a8af5c880ee646d1e62a2ea4557d5b21151fd280e6ffe26687797a88de5a99ef137fe07bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -214,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a620ff51bda7f6ba28747f1155da8e9462da1c6f9d3d0eb33637881639984f0aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xab00e651d5c70b7e9ec18e2fd361983faa0c07625af710bb6a25f4d1e1375167",
+        "lastblockhash" : "0x2dacdbc13fea0203f4bb9ce7bdc24da8059d10e3c7e2f48ed2942d4386ae4dc6",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -299,312 +299,13 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "bee77ff6d24414d1ab847eb784233d6e67b3fe04319084a991a5dd0a9fe59a94"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x01560b",
-                    "hash" : "0x272da5ddeef8c6dd606efb634a1506ca298f8da82050c82f1f6faee4dccd7151",
-                    "mixHash" : "0xdc5d4cd37cdc489995a3cc7136888e5eb8030201b235555716ecd39c88b2fdf8",
-                    "nonce" : "0x7d08aa3d47546ae6",
-                    "number" : "0x01",
-                    "parentHash" : "0x7521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364",
-                    "receiptTrie" : "0x5db0c4a2708aba30824d95a97638a0cdc1cc932b033879315f14e1a66d4f5f69",
-                    "stateRoot" : "0xdd3096fd913fee9e9e32eb6245614fc74ea9ecba135097023185aa53d21f019e",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a07521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd3096fd913fee9e9e32eb6245614fc74ea9ecba135097023185aa53d21f019ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05db0c4a2708aba30824d95a97638a0cdc1cc932b033879315f14e1a66d4f5f69b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001839896808301560b8203e880a0dc5d4cd37cdc489995a3cc7136888e5eb8030201b235555716ecd39c88b2fdf8887d08aa3d47546ae6f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x272da5ddeef8c6dd606efb634a1506ca298f8da82050c82f1f6faee4dccd7151",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : {
-            "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_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "bee77ff6d24414d1ab847eb784233d6e67b3fe04319084a991a5dd0a9fe59a94"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x029fe0",
-                    "hash" : "0xbe179a6e53fa3670b1b4984bc978a968609f214bde453fe140467193d995fb47",
-                    "mixHash" : "0x45d8ae3e8c9f3deefa7bb3fc82812d58e20a274849492ebe88ca71b77f6c8d1f",
-                    "nonce" : "0x68e116a63ce56187",
-                    "number" : "0x01",
-                    "parentHash" : "0x7521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364",
-                    "receiptTrie" : "0xffebc7dd796b61628611afbc88c2fe5ebf24bf890563437630c3f72ea1eee5ee",
-                    "stateRoot" : "0x3e403265ce4748cd8e8a74172ca0a1f41b4eab12b7035cc98a16e2b92ca561cb",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a07521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e403265ce4748cd8e8a74172ca0a1f41b4eab12b7035cc98a16e2b92ca561cba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ffebc7dd796b61628611afbc88c2fe5ebf24bf890563437630c3f72ea1eee5eeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a045d8ae3e8c9f3deefa7bb3fc82812d58e20a274849492ebe88ca71b77f6c8d1f8868e116a63ce56187f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0xbe179a6e53fa3670b1b4984bc978a968609f214bde453fe140467193d995fb47",
-        "network" : "Frontier",
-        "postState" : {
-            "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" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f69fe0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7616020",
-                "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_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0Filler.json",
-            "sourceHash" : "bee77ff6d24414d1ab847eb784233d6e67b3fe04319084a991a5dd0a9fe59a94"
+            "sourceHash" : "a1c485300e5a23f9cc3b6f5fa33937e1122b80a9db3cbf914e10f0804b65f386"
         },
         "blocks" : [
             {
@@ -615,9 +316,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150bf",
-                    "hash" : "0xc87e0d5b476e99b574cdc518bf17aa0188cbfdb85cb2d6ee5215b444cb5bb810",
-                    "mixHash" : "0x0c59ba59cb79fd5d9837296519d27daac0b7565b46be56b04d1a39428fa24464",
-                    "nonce" : "0xb45e8de0ce45461b",
+                    "hash" : "0x69ccca8d19cb6fe167a7a5ca6ccad49338421333c6b8476e372df8a64172fc6a",
+                    "mixHash" : "0xf0d6323ac25d2eb3c4729534f49537d743c31e296b6e334f83f30e06a446d762",
+                    "nonce" : "0x9dd69e4f298531a8",
                     "number" : "0x01",
                     "parentHash" : "0x7521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364",
                     "receiptTrie" : "0x8c08c62842dd89433ba3e326a0fc4d8df7ea0eb531f3268a85af0741e8b235ab",
@@ -626,10 +327,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03f99e0dd20d473276c121adfe85bb3120f9ec91130e3bd49532d1e2567d7c800a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08c08c62842dd89433ba3e326a0fc4d8df7ea0eb531f3268a85af0741e8b235abb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150bf8203e880a00c59ba59cb79fd5d9837296519d27daac0b7565b46be56b04d1a39428fa2446488b45e8de0ce45461bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a07521ed18e5e19b51d0aafcbe33a49995c3b92844058d56313d75cff843273364a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03f99e0dd20d473276c121adfe85bb3120f9ec91130e3bd49532d1e2567d7c800a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08c08c62842dd89433ba3e326a0fc4d8df7ea0eb531f3268a85af0741e8b235abb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150bf8203e880a0f0d6323ac25d2eb3c4729534f49537d743c31e296b6e334f83f30e06a446d762889dd69e4f298531a8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -663,7 +364,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a620ff51bda7f6ba28747f1155da8e9462da1c6f9d3d0eb33637881639984f0aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc87e0d5b476e99b574cdc518bf17aa0188cbfdb85cb2d6ee5215b444cb5bb810",
+        "lastblockhash" : "0x69ccca8d19cb6fe167a7a5ca6ccad49338421333c6b8476e372df8a64172fc6a",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0.json
index 1280f403e..69e497f48 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "09b07c30e30c99e46c365dada4a085ad123a1a7636c0f648b0f3f8a87b455785"
+            "sourceHash" : "0494fd91faead095e7e23c492d6e7156cc5bae27b78b692436977479e9ec1afb"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155f7",
-                    "hash" : "0xda280d5d1ccea02cab34969ef1d9ce5c120377ec96f77c46a232e3405279c5f4",
-                    "mixHash" : "0x412ebb49177dd70f334e7e7f343ce386b9099bc938d9642a5efc233621a496d0",
-                    "nonce" : "0x51ba4179735bb470",
+                    "hash" : "0x3842bb9c4f33dd510cce336fb062be8c546e4623062de4199015484233fd70cc",
+                    "mixHash" : "0x31a0096fe578d413215e7a43d80be3bc671382bef192fc4148989a5a88aa683c",
+                    "nonce" : "0x81d13d203cb32ff9",
                     "number" : "0x01",
                     "parentHash" : "0x24800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20e",
                     "receiptTrie" : "0x7b32f6865ba11d16b4c8e757d35f80e1ea3ddb33d2b2fc644a01c5a2bbb5ba1f",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a024800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa686ce489c7633fb89dba7360deae1e325e87482308f8d69e8d5a2e714f2f3ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07b32f6865ba11d16b4c8e757d35f80e1ea3ddb33d2b2fc644a01c5a2bbb5ba1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a0412ebb49177dd70f334e7e7f343ce386b9099bc938d9642a5efc233621a496d08851ba4179735bb470f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a024800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa686ce489c7633fb89dba7360deae1e325e87482308f8d69e8d5a2e714f2f3ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07b32f6865ba11d16b4c8e757d35f80e1ea3ddb33d2b2fc644a01c5a2bbb5ba1fb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a031a0096fe578d413215e7a43d80be3bc671382bef192fc4148989a5a88aa683c8881d13d203cb32ff9f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08bffe1e4c69981b1e0ccd79b92741290ff51be449f3d9f242fea4ceb2b6c1acca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xda280d5d1ccea02cab34969ef1d9ce5c120377ec96f77c46a232e3405279c5f4",
+        "lastblockhash" : "0x3842bb9c4f33dd510cce336fb062be8c546e4623062de4199015484233fd70cc",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -152,10 +152,10 @@
     "callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "09b07c30e30c99e46c365dada4a085ad123a1a7636c0f648b0f3f8a87b455785"
+            "sourceHash" : "0494fd91faead095e7e23c492d6e7156cc5bae27b78b692436977479e9ec1afb"
         },
         "blocks" : [
             {
@@ -166,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155f7",
-                    "hash" : "0xe564c43ec64c757133abc5348a4a7c6c7026dbb299683f3533019452a9e9e0ab",
-                    "mixHash" : "0x7ed7c24a70f8e94a6abd3b2da2b76776947bbe0841344ad8f20998248a1ce1d0",
-                    "nonce" : "0xa71a74a7d615171d",
+                    "hash" : "0x91c79a9f7df6211815c73683e6d3c29d317c572b999c7ffafb8606f687852f92",
+                    "mixHash" : "0x5c815c48dc958fa57d2ba3b9f46b81d12aed34c544376b3ae9331db3db6fd58b",
+                    "nonce" : "0x7d7e37ffaa3b4f6b",
                     "number" : "0x01",
                     "parentHash" : "0x24800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20e",
                     "receiptTrie" : "0x7fe5447b8ea35a9a30ed2d09717368bfa1308881afe846cdd61e097a81ecc2d4",
@@ -177,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a024800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bcf499de200a63162a63c6c25df35fbfe3d30793272e2f7d89010215568d531a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07fe5447b8ea35a9a30ed2d09717368bfa1308881afe846cdd61e097a81ecc2d4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a07ed7c24a70f8e94a6abd3b2da2b76776947bbe0841344ad8f20998248a1ce1d088a71a74a7d615171df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a024800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bcf499de200a63162a63c6c25df35fbfe3d30793272e2f7d89010215568d531a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07fe5447b8ea35a9a30ed2d09717368bfa1308881afe846cdd61e097a81ecc2d4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a05c815c48dc958fa57d2ba3b9f46b81d12aed34c544376b3ae9331db3db6fd58b887d7e37ffaa3b4f6bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -214,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08bffe1e4c69981b1e0ccd79b92741290ff51be449f3d9f242fea4ceb2b6c1acca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe564c43ec64c757133abc5348a4a7c6c7026dbb299683f3533019452a9e9e0ab",
+        "lastblockhash" : "0x91c79a9f7df6211815c73683e6d3c29d317c572b999c7ffafb8606f687852f92",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -299,312 +299,13 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "09b07c30e30c99e46c365dada4a085ad123a1a7636c0f648b0f3f8a87b455785"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0155f7",
-                    "hash" : "0xaafa86ef7ecb0331deed49fd3ccd08816e6bab12c7d51c8285145db51833ad47",
-                    "mixHash" : "0xe6953d5d6772e39a34134025a5246eeae0d6df363b5289af30f7465190f91c4e",
-                    "nonce" : "0x3f5dcfa9d986d6ab",
-                    "number" : "0x01",
-                    "parentHash" : "0x24800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20e",
-                    "receiptTrie" : "0x7fe5447b8ea35a9a30ed2d09717368bfa1308881afe846cdd61e097a81ecc2d4",
-                    "stateRoot" : "0x9bcf499de200a63162a63c6c25df35fbfe3d30793272e2f7d89010215568d531",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a024800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09bcf499de200a63162a63c6c25df35fbfe3d30793272e2f7d89010215568d531a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07fe5447b8ea35a9a30ed2d09717368bfa1308881afe846cdd61e097a81ecc2d4b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155f78203e880a0e6953d5d6772e39a34134025a5246eeae0d6df363b5289af30f7465190f91c4e883f5dcfa9d986d6abf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0xaafa86ef7ecb0331deed49fd3ccd08816e6bab12c7d51c8285145db51833ad47",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : {
-            "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_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "09b07c30e30c99e46c365dada4a085ad123a1a7636c0f648b0f3f8a87b455785"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x029fe0",
-                    "hash" : "0x5863a04d6ac10161708f859a1414ae6d958d8aa6a58ce4aa9d93507d8b576e9b",
-                    "mixHash" : "0xf868131826929c23ff8d4b0d0202fba1fed61c2c4ab0af03fed1849889db46d8",
-                    "nonce" : "0x93021dba6825f33a",
-                    "number" : "0x01",
-                    "parentHash" : "0x24800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20e",
-                    "receiptTrie" : "0x982b68c6635d0593e6e1a1fb8ab52eccdd389447a37ec68a90ad5973487ff813",
-                    "stateRoot" : "0xa90cc6907a7b020d8ca6f574da34f3af9fbfd56aa1e06ba13d8f49402095f88a",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a024800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a90cc6907a7b020d8ca6f574da34f3af9fbfd56aa1e06ba13d8f49402095f88aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0982b68c6635d0593e6e1a1fb8ab52eccdd389447a37ec68a90ad5973487ff813b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968083029fe08203e880a0f868131826929c23ff8d4b0d0202fba1fed61c2c4ab0af03fed1849889db46d88893021dba6825f33af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x5863a04d6ac10161708f859a1414ae6d958d8aa6a58ce4aa9d93507d8b576e9b",
-        "network" : "Frontier",
-        "postState" : {
-            "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" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f69fe0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7616020",
-                "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_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0Filler.json",
-            "sourceHash" : "09b07c30e30c99e46c365dada4a085ad123a1a7636c0f648b0f3f8a87b455785"
+            "sourceHash" : "0494fd91faead095e7e23c492d6e7156cc5bae27b78b692436977479e9ec1afb"
         },
         "blocks" : [
             {
@@ -615,9 +316,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150bf",
-                    "hash" : "0xecfa28cc45af05f1330fed04083a750359fc409725c6a7a62e548cf319bb55dd",
-                    "mixHash" : "0xe45c51e8d8696b860ca3efae542f5b284f8752379c4362eef99e29b36966a4c5",
-                    "nonce" : "0xa1bb2b7ce756f170",
+                    "hash" : "0x12f385565c94c62fe5755eefd69a43fc9cb960e8cfa012420493982bae73a107",
+                    "mixHash" : "0x1d6875b7bed8e9e5a86d3dd0919c75463eb1957908528779eef54c960b6a1e2b",
+                    "nonce" : "0x1f4296c1f834f96f",
                     "number" : "0x01",
                     "parentHash" : "0x24800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20e",
                     "receiptTrie" : "0xfedb18c624cbe9bfd0291e5389cc6a67f414a390fc31c52cddc6ccf2fb7909a2",
@@ -626,10 +327,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a024800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc1b4e1299ecb1f08ce10b0e79726c6d93e8e29390e6e6c491c97e85fd6c8ccba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fedb18c624cbe9bfd0291e5389cc6a67f414a390fc31c52cddc6ccf2fb7909a2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150bf8203e880a0e45c51e8d8696b860ca3efae542f5b284f8752379c4362eef99e29b36966a4c588a1bb2b7ce756f170f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a024800cfe3f7a574d235ed225f27114450b110b7ac9885c43801bab238970c20ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc1b4e1299ecb1f08ce10b0e79726c6d93e8e29390e6e6c491c97e85fd6c8ccba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fedb18c624cbe9bfd0291e5389cc6a67f414a390fc31c52cddc6ccf2fb7909a2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150bf8203e880a01d6875b7bed8e9e5a86d3dd0919c75463eb1957908528779eef54c960b6a1e2b881f4296c1f834f96ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -663,7 +364,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08bffe1e4c69981b1e0ccd79b92741290ff51be449f3d9f242fea4ceb2b6c1acca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xecfa28cc45af05f1330fed04083a750359fc409725c6a7a62e548cf319bb55dd",
+        "lastblockhash" : "0x12f385565c94c62fe5755eefd69a43fc9cb960e8cfa012420493982bae73a107",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_d0g0v0.json
index 56e4b7625..36ac88a0b 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGMAfter_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "7a5bc1aee720e97c6d66124758cc97602ecc29efd1245c0f3f94acc4d2aab316"
+            "sourceHash" : "a2f2ee752737e9d147417b0c637809aede253980c38753ca99f8fba05231f32c"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0x7371c7c99f1e99e7efbc4a3d3579fbf461e78ec992be3c8c4b6d393834eee937",
-                    "mixHash" : "0x7314fe7b99e79fffd25f7716721d6d5d8585b7decf17605e57562cb50a5b0fbb",
-                    "nonce" : "0x4ce93990972951db",
+                    "hash" : "0x9a7300c3cea05aefe1d0be5fd707857b06177910495b897e776ca94f922fba5d",
+                    "mixHash" : "0x4c4c8fbb3bd818e0a683704118e8c48347e673f40aee1c5e611970c70d8ff61a",
+                    "nonce" : "0xa7ba76d1500f16dd",
                     "number" : "0x01",
                     "parentHash" : "0x0eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580",
                     "receiptTrie" : "0x7a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787da",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed5e786456b2ac5572ac0449636c468195a1b5eecca26a7e99fe479de6dbe136a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a07314fe7b99e79fffd25f7716721d6d5d8585b7decf17605e57562cb50a5b0fbb884ce93990972951dbf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a00eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed5e786456b2ac5572ac0449636c468195a1b5eecca26a7e99fe479de6dbe136a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07a2f2a69bbbb927218a006f0d3b7bd88c282e62c82eecdbfb11146f1d64787dab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a04c4c8fbb3bd818e0a683704118e8c48347e673f40aee1c5e611970c70d8ff61a88a7ba76d1500f16ddf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7371c7c99f1e99e7efbc4a3d3579fbf461e78ec992be3c8c4b6d393834eee937",
+        "lastblockhash" : "0x9a7300c3cea05aefe1d0be5fd707857b06177910495b897e776ca94f922fba5d",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -152,10 +152,10 @@
     "callcodecallcodecallcode_111_OOGMAfter_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "7a5bc1aee720e97c6d66124758cc97602ecc29efd1245c0f3f94acc4d2aab316"
+            "sourceHash" : "a2f2ee752737e9d147417b0c637809aede253980c38753ca99f8fba05231f32c"
         },
         "blocks" : [
             {
@@ -166,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0155fd",
-                    "hash" : "0x31e2518eb636765093dc8a902f9ad45299c34751b23c9e907b166a3c3af9a015",
-                    "mixHash" : "0x3e63bfa1548079d8ed612b4594cb2dab7167371800a46c0032e6859e470b067f",
-                    "nonce" : "0x3bf4ec5cb365cada",
+                    "hash" : "0x8e530bbc472c8dee9bb0a14de6d4cc74739bf1d0dead7a4213b5812eb29de902",
+                    "mixHash" : "0x423c1ad1cd3e75659c66687eb08fc2b3d8792d8336a2e392734298526bec2244",
+                    "nonce" : "0x3a53694b5f6b6bd8",
                     "number" : "0x01",
                     "parentHash" : "0x0eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580",
                     "receiptTrie" : "0x85a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81",
@@ -177,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b947e2b0ce1eba06d5377de67de699d8fa10f9234c85d839746091d67d8f8a18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea085a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a03e63bfa1548079d8ed612b4594cb2dab7167371800a46c0032e6859e470b067f883bf4ec5cb365cadaf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a00eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b947e2b0ce1eba06d5377de67de699d8fa10f9234c85d839746091d67d8f8a18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea085a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0423c1ad1cd3e75659c66687eb08fc2b3d8792d8336a2e392734298526bec2244883a53694b5f6b6bd8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -214,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x31e2518eb636765093dc8a902f9ad45299c34751b23c9e907b166a3c3af9a015",
+        "lastblockhash" : "0x8e530bbc472c8dee9bb0a14de6d4cc74739bf1d0dead7a4213b5812eb29de902",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -299,312 +299,13 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_OOGMAfter_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "7a5bc1aee720e97c6d66124758cc97602ecc29efd1245c0f3f94acc4d2aab316"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0155fd",
-                    "hash" : "0xbeaf43956d65392eb71281559e500de0a6599489e4cce264adc915feb6b7d5ec",
-                    "mixHash" : "0xc7b9861555b6c66d06111f713e7d353f6dc685c7bb332c20476eed445dc1c96b",
-                    "nonce" : "0x3132c1f53792dfc3",
-                    "number" : "0x01",
-                    "parentHash" : "0x0eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580",
-                    "receiptTrie" : "0x85a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81",
-                    "stateRoot" : "0xb947e2b0ce1eba06d5377de67de699d8fa10f9234c85d839746091d67d8f8a18",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a00eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b947e2b0ce1eba06d5377de67de699d8fa10f9234c85d839746091d67d8f8a18a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea085a07b6f0cd7cfb28f6c599d1d62dbe2b4c68bb07afe9d9d9277329d21dbbf81b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830155fd8203e880a0c7b9861555b6c66d06111f713e7d353f6dc685c7bb332c20476eed445dc1c96b883132c1f53792dfc3f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0xbeaf43956d65392eb71281559e500de0a6599489e4cce264adc915feb6b7d5ec",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : {
-            "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_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "7a5bc1aee720e97c6d66124758cc97602ecc29efd1245c0f3f94acc4d2aab316"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x0150cc",
-                    "hash" : "0x4b4b2472b304c8f36e5b682ac2f1584cdcc16ec010d61cfe25ad7263a11fd55f",
-                    "mixHash" : "0xce0bea4a75ea428d4400f1a1e9fece1050157c642aabd9117edb8354c349bf37",
-                    "nonce" : "0x7bb8e3f08ca0a9e0",
-                    "number" : "0x01",
-                    "parentHash" : "0x0eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580",
-                    "receiptTrie" : "0x6d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494",
-                    "stateRoot" : "0xbd38189382c50bb083d4b0dafbec8975ddddb7e3cb3a11792409eb9a49aecfdf",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a00eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd38189382c50bb083d4b0dafbec8975ddddb7e3cb3a11792409eb9a49aecfdfa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0ce0bea4a75ea428d4400f1a1e9fece1050157c642aabd9117edb8354c349bf37887bb8e3f08ca0a9e0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x4b4b2472b304c8f36e5b682ac2f1584cdcc16ec010d61cfe25ad7263a11fd55f",
-        "network" : "Frontier",
-        "postState" : {
-            "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" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550cc",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af34",
-                "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_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "7a5bc1aee720e97c6d66124758cc97602ecc29efd1245c0f3f94acc4d2aab316"
+            "sourceHash" : "a2f2ee752737e9d147417b0c637809aede253980c38753ca99f8fba05231f32c"
         },
         "blocks" : [
             {
@@ -615,9 +316,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x0150cc",
-                    "hash" : "0x828a75187c7a07a9a4183031a19400a3d0d84921c6966439a099300c230cffda",
-                    "mixHash" : "0xaadd819e3ca65d451ba0294bbbe65a1fe01779b08bda30bcb04bc0f66598c5ae",
-                    "nonce" : "0x8ac9af28e979cf7f",
+                    "hash" : "0xc580abe15c8e05d62721fe728edd9d6e8bb25a212aa7b1584f896b3b8b66d479",
+                    "mixHash" : "0xb41fe5c0457694f0809a67a6c1c17026eb9aa9aeb8ac0dc04837c9e83a33ef7d",
+                    "nonce" : "0x2aaf885538317488",
                     "number" : "0x01",
                     "parentHash" : "0x0eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580",
                     "receiptTrie" : "0x6d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494",
@@ -626,10 +327,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a00eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd38189382c50bb083d4b0dafbec8975ddddb7e3cb3a11792409eb9a49aecfdfa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0aadd819e3ca65d451ba0294bbbe65a1fe01779b08bda30bcb04bc0f66598c5ae888ac9af28e979cf7ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90260f901f8a00eba37cdb7e6d90b58caeb9fbaef9d6425b45f0630f30400344529d4acf5d580a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bd38189382c50bb083d4b0dafbec8975ddddb7e3cb3a11792409eb9a49aecfdfa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea06d9ec07d00657fb3a4f0dcd5436e22651d42a4e31ff8c94664f466ed19f7f494b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830150cc8203e880a0b41fe5c0457694f0809a67a6c1c17026eb9aa9aeb8ac0dc04837c9e83a33ef7d882aaf885538317488f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -663,7 +364,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a161e4ceed974250319f50c9c26312c071748db0e4854933e01bacd4d052b01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x828a75187c7a07a9a4183031a19400a3d0d84921c6966439a099300c230cffda",
+        "lastblockhash" : "0xc580abe15c8e05d62721fe728edd9d6e8bb25a212aa7b1584f896b3b8b66d479",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0.json
index 73a894056..e065e67f2 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0.json
@@ -2,10 +2,10 @@
     "contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0Filler.json",
-            "sourceHash" : "65f2fb49a41d79e95bc5d881d51917ebc5953339e63924fbc2290e1743d05ae1"
+            "sourceHash" : "36d467af131be1ef363e02366b08f4aa854b824898786ff30cdffb4b15af4e01"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x012411",
-                    "hash" : "0x73f6b00534833c7934b6da05a5b17e639a1cf6ced5e6484f17920659889a03de",
-                    "mixHash" : "0xe47177583ac8660e20f2fbf2725dfcc20c3dffe97e92eb2dc1e9ea3b51609957",
-                    "nonce" : "0xe87c6473b42dcc0b",
+                    "hash" : "0x40435cd3ab84a6c32574e7912f575cb03fcd730f38225b2095df22bb3246af4b",
+                    "mixHash" : "0x6efa222c25827787df31bc630c62b03d5f9c2e39d3f1009e2209feb73b8b88dc",
+                    "nonce" : "0xd0c8505573867e24",
                     "number" : "0x01",
                     "parentHash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
                     "receiptTrie" : "0xd3e8dadbfb4135b152b7668c12a668eb9404d351609ba709e236bc4b0289dfc7",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0xfadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff901f8a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edd2a643fdedcecfe77a852ba76bdf8ffb703d759c344a5bb75e0ecc7cbd6749a0fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75a0d3e8dadbfb4135b152b7668c12a668eb9404d351609ba709e236bc4b0289dfc7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124118203e880a0e47177583ac8660e20f2fbf2725dfcc20c3dffe97e92eb2dc1e9ea3b5160995788e87c6473b42dcc0bf871f86f8001830177008080a36040600060406000600073100000000000000000000000000000000000000161c350f11ba0853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9ea035ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0c0",
+                "rlp" : "0xf9026ff901f8a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0edd2a643fdedcecfe77a852ba76bdf8ffb703d759c344a5bb75e0ecc7cbd6749a0fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75a0d3e8dadbfb4135b152b7668c12a668eb9404d351609ba709e236bc4b0289dfc7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124118203e880a06efa222c25827787df31bc630c62b03d5f9c2e39d3f1009e2209feb73b8b88dc88d0c8505573867e24f871f86f8001830177008080a36040600060406000600073100000000000000000000000000000000000000161c350f11ba0853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9ea035ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0c0",
                 "transactions" : [
                     {
                         "data" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x73f6b00534833c7934b6da05a5b17e639a1cf6ced5e6484f17920659889a03de",
+        "lastblockhash" : "0x40435cd3ab84a6c32574e7912f575cb03fcd730f38225b2095df22bb3246af4b",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -131,10 +131,10 @@
     "contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0Filler.json",
-            "sourceHash" : "65f2fb49a41d79e95bc5d881d51917ebc5953339e63924fbc2290e1743d05ae1"
+            "sourceHash" : "36d467af131be1ef363e02366b08f4aa854b824898786ff30cdffb4b15af4e01"
         },
         "blocks" : [
             {
@@ -145,9 +145,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x012411",
-                    "hash" : "0x017fbc0ecf8f7e84a9c3f743d2c7bc70808200026556456e81e3978249d354ce",
-                    "mixHash" : "0x6059f7bbc779e928463ec530a2e4c4771261595d669970a0177239710c73c395",
-                    "nonce" : "0x58fe71e3a2a00a98",
+                    "hash" : "0xc5a9c87283fb6d9b81b35c5f1a02a5dcf504d3519785d766c5f6e129b9913821",
+                    "mixHash" : "0x0185057a02b0a2d5250d766dda149d6dc4483b2f60f989133700221577d365cd",
+                    "nonce" : "0xfa67ee675833f0a0",
                     "number" : "0x01",
                     "parentHash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
                     "receiptTrie" : "0x688c1b2f7442a5b35a54c7d45fecbe34d217f34b6034a1efcfa58c69ff256823",
@@ -156,7 +156,7 @@
                     "transactionsTrie" : "0xfadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff901f8a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0feef22de91fe396f0f0d855ae5050d1ca88ef1bcfd4a5e2b004a48311ff5dbdca0fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75a0688c1b2f7442a5b35a54c7d45fecbe34d217f34b6034a1efcfa58c69ff256823b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124118203e880a06059f7bbc779e928463ec530a2e4c4771261595d669970a0177239710c73c3958858fe71e3a2a00a98f871f86f8001830177008080a36040600060406000600073100000000000000000000000000000000000000161c350f11ba0853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9ea035ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0c0",
+                "rlp" : "0xf9026ff901f8a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0feef22de91fe396f0f0d855ae5050d1ca88ef1bcfd4a5e2b004a48311ff5dbdca0fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75a0688c1b2f7442a5b35a54c7d45fecbe34d217f34b6034a1efcfa58c69ff256823b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124118203e880a00185057a02b0a2d5250d766dda149d6dc4483b2f60f989133700221577d365cd88fa67ee675833f0a0f871f86f8001830177008080a36040600060406000600073100000000000000000000000000000000000000161c350f11ba0853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9ea035ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0c0",
                 "transactions" : [
                     {
                         "data" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
@@ -193,7 +193,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x017fbc0ecf8f7e84a9c3f743d2c7bc70808200026556456e81e3978249d354ce",
+        "lastblockhash" : "0xc5a9c87283fb6d9b81b35c5f1a02a5dcf504d3519785d766c5f6e129b9913821",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -257,142 +257,13 @@
             }
         }
     },
-    "contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0Filler.json",
-            "sourceHash" : "65f2fb49a41d79e95bc5d881d51917ebc5953339e63924fbc2290e1743d05ae1"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x012411",
-                    "hash" : "0xac078decdaa05d8d78de5dc9d3872575a2b51ab3ecb4338961f66995c5c23b31",
-                    "mixHash" : "0xbd71a7f6dfe5999aa55b62eb5846f47f981cc513e1cd0b27ea8c6735cef7b86f",
-                    "nonce" : "0x0054ad9a47f575bf",
-                    "number" : "0x01",
-                    "parentHash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
-                    "receiptTrie" : "0xfef1a9f2cb211d1cd6f070357f74fb95d27d43cb2d6a70970fac5813de19e020",
-                    "stateRoot" : "0x60b79c80ea419bdff2ef3936fa533871cd3ba9956d15a6eb49728b43880bdeae",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xfadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026ff901f8a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa060b79c80ea419bdff2ef3936fa533871cd3ba9956d15a6eb49728b43880bdeaea0fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75a0fef1a9f2cb211d1cd6f070357f74fb95d27d43cb2d6a70970fac5813de19e020b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830124118203e880a0bd71a7f6dfe5999aa55b62eb5846f47f981cc513e1cd0b27ea8c6735cef7b86f880054ad9a47f575bff871f86f8001830177008080a36040600060406000600073100000000000000000000000000000000000000161c350f11ba0853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9ea035ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0c0",
-                "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" : "0xac078decdaa05d8d78de5dc9d3872575a2b51ab3ecb4338961f66995c5c23b31",
-        "network" : "EIP158",
-        "postState" : {
-            "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" : {
-                }
-            },
-            "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_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0Filler.json",
-            "sourceHash" : "65f2fb49a41d79e95bc5d881d51917ebc5953339e63924fbc2290e1743d05ae1"
+            "sourceHash" : "36d467af131be1ef363e02366b08f4aa854b824898786ff30cdffb4b15af4e01"
         },
         "blocks" : [
             {
@@ -403,9 +274,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xa47d",
-                    "hash" : "0x855e733891da53e376038dfcfb0d051476509619b78d939cf74c39d43123cb7b",
-                    "mixHash" : "0xeabc580ad1117d9fa204ba0d2682593bde03ae7dbc8ee3aaed9c48c8d067ea06",
-                    "nonce" : "0x3be40885a8df19ea",
+                    "hash" : "0x41826570c38093385638769e2489b320f1df2f70fb1a386ae26d1c431beaa68e",
+                    "mixHash" : "0x44014cc4edc1f58a978a367c6acb1a1f27c506264e26677495af532b4955073b",
+                    "nonce" : "0xc507ffa80e461930",
                     "number" : "0x01",
                     "parentHash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
                     "receiptTrie" : "0xd5b6215f765844456d94f50fc853295d3736cccff39682e7591692fc585d9324",
@@ -414,7 +285,7 @@
                     "transactionsTrie" : "0xfadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ef901f7a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0078d057b3dac082521e7bd28330c62d8bbaaaa3dc2b6de12218ffce58efea997a0fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75a0d5b6215f765844456d94f50fc853295d3736cccff39682e7591692fc585d9324b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a47d8203e880a0eabc580ad1117d9fa204ba0d2682593bde03ae7dbc8ee3aaed9c48c8d067ea06883be40885a8df19eaf871f86f8001830177008080a36040600060406000600073100000000000000000000000000000000000000161c350f11ba0853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9ea035ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0c0",
+                "rlp" : "0xf9026ef901f7a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0078d057b3dac082521e7bd28330c62d8bbaaaa3dc2b6de12218ffce58efea997a0fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75a0d5b6215f765844456d94f50fc853295d3736cccff39682e7591692fc585d9324b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082a47d8203e880a044014cc4edc1f58a978a367c6acb1a1f27c506264e26677495af532b4955073b88c507ffa80e461930f871f86f8001830177008080a36040600060406000600073100000000000000000000000000000000000000161c350f11ba0853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9ea035ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0c0",
                 "transactions" : [
                     {
                         "data" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
@@ -451,7 +322,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x855e733891da53e376038dfcfb0d051476509619b78d939cf74c39d43123cb7b",
+        "lastblockhash" : "0x41826570c38093385638769e2489b320f1df2f70fb1a386ae26d1c431beaa68e",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -518,10 +389,10 @@
     "contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0Filler.json",
-            "sourceHash" : "65f2fb49a41d79e95bc5d881d51917ebc5953339e63924fbc2290e1743d05ae1"
+            "sourceHash" : "36d467af131be1ef363e02366b08f4aa854b824898786ff30cdffb4b15af4e01"
         },
         "blocks" : [
             {
@@ -532,9 +403,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x017700",
-                    "hash" : "0xfe55c8e0cec2b66b33d8db0e6b23fe21f59ef53496de68625f928283feb24792",
-                    "mixHash" : "0x85c69f01eeda63a3d56d62fb34fe4e46da3a7d4e09219e0e4ed85f239bf5d7fd",
-                    "nonce" : "0xc1c1a5864ffa6c9f",
+                    "hash" : "0xdcb7611f3a1f824829b01769c49eba91049f3cba25eb18f8f29c5c5b4b699bf1",
+                    "mixHash" : "0xf6dc9424bda0af0f31511cef044a85dd13227541f0102af05ebb54fdcc9b60c4",
+                    "nonce" : "0xc19251d91406dd1a",
                     "number" : "0x01",
                     "parentHash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
                     "receiptTrie" : "0xe025bec05756981d211bf8cf5e2e85b400b5884537b3b9b9db6bf2dd38d836d5",
@@ -543,7 +414,7 @@
                     "transactionsTrie" : "0xfadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026ff901f8a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d44b5a75027423028435928d18f87c52aa1eb6b58b247e89f4c878476363cf19a0fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75a0e025bec05756981d211bf8cf5e2e85b400b5884537b3b9b9db6bf2dd38d836d5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830177008203e880a085c69f01eeda63a3d56d62fb34fe4e46da3a7d4e09219e0e4ed85f239bf5d7fd88c1c1a5864ffa6c9ff871f86f8001830177008080a36040600060406000600073100000000000000000000000000000000000000161c350f11ba0853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9ea035ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0c0",
+                "rlp" : "0xf9026ff901f8a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d44b5a75027423028435928d18f87c52aa1eb6b58b247e89f4c878476363cf19a0fadf0d215532cd6486a8ddfac719ca2eabd2547f7cda9f32185c1177c7f23d75a0e025bec05756981d211bf8cf5e2e85b400b5884537b3b9b9db6bf2dd38d836d5b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000183989680830177008203e880a0f6dc9424bda0af0f31511cef044a85dd13227541f0102af05ebb54fdcc9b60c488c19251d91406dd1af871f86f8001830177008080a36040600060406000600073100000000000000000000000000000000000000161c350f11ba0853740cbaebf3b696c992d835f16e8159e521ad8b04ec513949cfba45c6b9e9ea035ac6d22ac62556b698ae2c76c368a2913b380732ba26254dc785e22926476a0c0",
                 "transactions" : [
                     {
                         "data" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
@@ -580,7 +451,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfe55c8e0cec2b66b33d8db0e6b23fe21f59ef53496de68625f928283feb24792",
+        "lastblockhash" : "0xdcb7611f3a1f824829b01769c49eba91049f3cba25eb18f8f29c5c5b4b699bf1",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0.json
index 4804b15f0..7da53e7cc 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0.json
@@ -2,10 +2,10 @@
     "contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0Filler.json",
-            "sourceHash" : "fe918d7575739021b1211750cb82f3b50c78d2133f5f40ba52b695b9f575e881"
+            "sourceHash" : "1851f476067bc092d3f9d5f3dfbf58a6f1de3aa9295b0bf456788d5bb4b87918"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xea0f",
-                    "hash" : "0x1ef192116eab5fbd88351b616aa0efb86a1a3f01cb42326edb9c898387f0c286",
-                    "mixHash" : "0xb72a77d560a237bc20526480bd5857de219c90745f89f4d76b783c4cd86355c5",
-                    "nonce" : "0xb5cccba6b702f563",
+                    "hash" : "0x8baea5b414f72ac93ce86d4b5a19c3bfda661f23c29370d7219e6942f77b2229",
+                    "mixHash" : "0x9d7bca8c29dba4280088a28c2d08ba93829b4d9f419b223361ce7c214cb03fbb",
+                    "nonce" : "0xac15ecd66cbc9b56",
                     "number" : "0x01",
                     "parentHash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
                     "receiptTrie" : "0xff7907de9bff421440d9afd6b825e4e3ad261e777c57ce4fbe7e5456d9409152",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x03fbc93b06abfb125798b953bc7f9172f64b676c173843c35d7fa21b11dcae1e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026df901f7a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fc981132808c1b7abd79258e5d98f9b879e3314cbc9c6fcc23191d74719bc2a7a003fbc93b06abfb125798b953bc7f9172f64b676c173843c35d7fa21b11dcae1ea0ff7907de9bff421440d9afd6b825e4e3ad261e777c57ce4fbe7e5456d9409152b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ea0f8203e880a0b72a77d560a237bc20526480bd5857de219c90745f89f4d76b783c4cd86355c588b5cccba6b702f563f870f86e800182ea608080a36040600060406000600073100000000000000000000000000000000000000161c350f11ca0755ad66294d4c687d3f77294c28a3dfc6d2c0abde0dd48222f51b3f1077587f0a01f2956fdf5004c42b9cb2d2fbac8e509d8c326c2379c8f907b27d840c3a857bbc0",
+                "rlp" : "0xf9026df901f7a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fc981132808c1b7abd79258e5d98f9b879e3314cbc9c6fcc23191d74719bc2a7a003fbc93b06abfb125798b953bc7f9172f64b676c173843c35d7fa21b11dcae1ea0ff7907de9bff421440d9afd6b825e4e3ad261e777c57ce4fbe7e5456d9409152b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ea0f8203e880a09d7bca8c29dba4280088a28c2d08ba93829b4d9f419b223361ce7c214cb03fbb88ac15ecd66cbc9b56f870f86e800182ea608080a36040600060406000600073100000000000000000000000000000000000000161c350f11ca0755ad66294d4c687d3f77294c28a3dfc6d2c0abde0dd48222f51b3f1077587f0a01f2956fdf5004c42b9cb2d2fbac8e509d8c326c2379c8f907b27d840c3a857bbc0",
                 "transactions" : [
                     {
                         "data" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1ef192116eab5fbd88351b616aa0efb86a1a3f01cb42326edb9c898387f0c286",
+        "lastblockhash" : "0x8baea5b414f72ac93ce86d4b5a19c3bfda661f23c29370d7219e6942f77b2229",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -130,10 +130,10 @@
     "contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0Filler.json",
-            "sourceHash" : "fe918d7575739021b1211750cb82f3b50c78d2133f5f40ba52b695b9f575e881"
+            "sourceHash" : "1851f476067bc092d3f9d5f3dfbf58a6f1de3aa9295b0bf456788d5bb4b87918"
         },
         "blocks" : [
             {
@@ -144,9 +144,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xea0f",
-                    "hash" : "0x1b72aba70cc7a1cedeff028b2cdf512d413112818e3d857886fcab14792dbe83",
-                    "mixHash" : "0x047b32e4ed596eedc7348f72e0142f4a5491ac10dde2f52a4809614e74edead8",
-                    "nonce" : "0x169ecb7034cc5400",
+                    "hash" : "0xd5706b219324cd455cda808d20135869dd5487a854d769195a67ab06023c5471",
+                    "mixHash" : "0x2b2a45d0d2b72f00d0ae1360b26537e7390a4f2e2844dfc8e980b159cfc5577b",
+                    "nonce" : "0x3a8a1fdc3d9addbc",
                     "number" : "0x01",
                     "parentHash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
                     "receiptTrie" : "0xde51dfd6b07f21b06caaf9efea6cfc8bb0d9bc157807625c7a03c055641e322e",
@@ -155,7 +155,7 @@
                     "transactionsTrie" : "0x03fbc93b06abfb125798b953bc7f9172f64b676c173843c35d7fa21b11dcae1e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026df901f7a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa026e8a2af23bfa5f1701436364396c2f8ec441655a6855159342149f05ce58338a003fbc93b06abfb125798b953bc7f9172f64b676c173843c35d7fa21b11dcae1ea0de51dfd6b07f21b06caaf9efea6cfc8bb0d9bc157807625c7a03c055641e322eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ea0f8203e880a0047b32e4ed596eedc7348f72e0142f4a5491ac10dde2f52a4809614e74edead888169ecb7034cc5400f870f86e800182ea608080a36040600060406000600073100000000000000000000000000000000000000161c350f11ca0755ad66294d4c687d3f77294c28a3dfc6d2c0abde0dd48222f51b3f1077587f0a01f2956fdf5004c42b9cb2d2fbac8e509d8c326c2379c8f907b27d840c3a857bbc0",
+                "rlp" : "0xf9026df901f7a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa026e8a2af23bfa5f1701436364396c2f8ec441655a6855159342149f05ce58338a003fbc93b06abfb125798b953bc7f9172f64b676c173843c35d7fa21b11dcae1ea0de51dfd6b07f21b06caaf9efea6cfc8bb0d9bc157807625c7a03c055641e322eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ea0f8203e880a02b2a45d0d2b72f00d0ae1360b26537e7390a4f2e2844dfc8e980b159cfc5577b883a8a1fdc3d9addbcf870f86e800182ea608080a36040600060406000600073100000000000000000000000000000000000000161c350f11ca0755ad66294d4c687d3f77294c28a3dfc6d2c0abde0dd48222f51b3f1077587f0a01f2956fdf5004c42b9cb2d2fbac8e509d8c326c2379c8f907b27d840c3a857bbc0",
                 "transactions" : [
                     {
                         "data" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
@@ -192,7 +192,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1b72aba70cc7a1cedeff028b2cdf512d413112818e3d857886fcab14792dbe83",
+        "lastblockhash" : "0xd5706b219324cd455cda808d20135869dd5487a854d769195a67ab06023c5471",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -255,141 +255,13 @@
             }
         }
     },
-    "contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0Filler.json",
-            "sourceHash" : "fe918d7575739021b1211750cb82f3b50c78d2133f5f40ba52b695b9f575e881"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0xea0f",
-                    "hash" : "0x64ba222c850ce499d36380370ad79166847a6ff7d552b1ac420eb1275541586c",
-                    "mixHash" : "0x372bb9ba91eaea98207fee172cf27f5a7d63f38ee208f7d5932ed6df28e3f8ae",
-                    "nonce" : "0x1ebd244a94fb67e1",
-                    "number" : "0x01",
-                    "parentHash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
-                    "receiptTrie" : "0x2c1cbc3c1da3b113535cd7109dcc9192edcbbd5c700c74aa5aad4bb20d4bd47b",
-                    "stateRoot" : "0xfd512c755f3d28ce69eb2f88ac841c815db491207899ae4fcd32b7a4c15b67e3",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x03fbc93b06abfb125798b953bc7f9172f64b676c173843c35d7fa21b11dcae1e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026df901f7a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fd512c755f3d28ce69eb2f88ac841c815db491207899ae4fcd32b7a4c15b67e3a003fbc93b06abfb125798b953bc7f9172f64b676c173843c35d7fa21b11dcae1ea02c1cbc3c1da3b113535cd7109dcc9192edcbbd5c700c74aa5aad4bb20d4bd47bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ea0f8203e880a0372bb9ba91eaea98207fee172cf27f5a7d63f38ee208f7d5932ed6df28e3f8ae881ebd244a94fb67e1f870f86e800182ea608080a36040600060406000600073100000000000000000000000000000000000000161c350f11ca0755ad66294d4c687d3f77294c28a3dfc6d2c0abde0dd48222f51b3f1077587f0a01f2956fdf5004c42b9cb2d2fbac8e509d8c326c2379c8f907b27d840c3a857bbc0",
-                "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" : "0x64ba222c850ce499d36380370ad79166847a6ff7d552b1ac420eb1275541586c",
-        "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.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0Filler.json",
-            "sourceHash" : "fe918d7575739021b1211750cb82f3b50c78d2133f5f40ba52b695b9f575e881"
+            "sourceHash" : "1851f476067bc092d3f9d5f3dfbf58a6f1de3aa9295b0bf456788d5bb4b87918"
         },
         "blocks" : [
             {
@@ -400,9 +272,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xea60",
-                    "hash" : "0x7c72bb5f9f08d03b09b1924db9a9d0b4dfa359065fcaaa82db3fece35bab3daf",
-                    "mixHash" : "0x386ac282a47fe2fffc4e3705048171461a0286f184413158d4b7b697e6832803",
-                    "nonce" : "0x99009c0c5fe85d84",
+                    "hash" : "0x337ae3019405835e04dd4c80b796dc67860ef9849af5b77abf0ef56f0a0eab2e",
+                    "mixHash" : "0x8cf5fe5d9d5f3130b8b25d412c91e3ba29692ceb117cc2405b1010a5c8822a49",
+                    "nonce" : "0x4b29239bc52beadc",
                     "number" : "0x01",
                     "parentHash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
                     "receiptTrie" : "0x1833f216e9c920d4846964121760d44e99cce64fd9d2d038e4834bb247aa1ffa",
@@ -411,7 +283,7 @@
                     "transactionsTrie" : "0x03fbc93b06abfb125798b953bc7f9172f64b676c173843c35d7fa21b11dcae1e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026df901f7a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039e2844a74774a8327789bf168f97af6ac0abd677b6b84d32c609b1d087c72aaa003fbc93b06abfb125798b953bc7f9172f64b676c173843c35d7fa21b11dcae1ea01833f216e9c920d4846964121760d44e99cce64fd9d2d038e4834bb247aa1ffab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ea608203e880a0386ac282a47fe2fffc4e3705048171461a0286f184413158d4b7b697e68328038899009c0c5fe85d84f870f86e800182ea608080a36040600060406000600073100000000000000000000000000000000000000161c350f11ca0755ad66294d4c687d3f77294c28a3dfc6d2c0abde0dd48222f51b3f1077587f0a01f2956fdf5004c42b9cb2d2fbac8e509d8c326c2379c8f907b27d840c3a857bbc0",
+                "rlp" : "0xf9026df901f7a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039e2844a74774a8327789bf168f97af6ac0abd677b6b84d32c609b1d087c72aaa003fbc93b06abfb125798b953bc7f9172f64b676c173843c35d7fa21b11dcae1ea01833f216e9c920d4846964121760d44e99cce64fd9d2d038e4834bb247aa1ffab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ea608203e880a08cf5fe5d9d5f3130b8b25d412c91e3ba29692ceb117cc2405b1010a5c8822a49884b29239bc52beadcf870f86e800182ea608080a36040600060406000600073100000000000000000000000000000000000000161c350f11ca0755ad66294d4c687d3f77294c28a3dfc6d2c0abde0dd48222f51b3f1077587f0a01f2956fdf5004c42b9cb2d2fbac8e509d8c326c2379c8f907b27d840c3a857bbc0",
                 "transactions" : [
                     {
                         "data" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
@@ -448,7 +320,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7c72bb5f9f08d03b09b1924db9a9d0b4dfa359065fcaaa82db3fece35bab3daf",
+        "lastblockhash" : "0x337ae3019405835e04dd4c80b796dc67860ef9849af5b77abf0ef56f0a0eab2e",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -507,10 +379,10 @@
     "contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0Filler.json",
-            "sourceHash" : "fe918d7575739021b1211750cb82f3b50c78d2133f5f40ba52b695b9f575e881"
+            "sourceHash" : "1851f476067bc092d3f9d5f3dfbf58a6f1de3aa9295b0bf456788d5bb4b87918"
         },
         "blocks" : [
             {
@@ -521,9 +393,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xea60",
-                    "hash" : "0xc856791dfc4d833a87eca102de8235505289d3f07fb9217545587964bdc9b48a",
-                    "mixHash" : "0x2fab21fa707af28ba885f08238ef885a5cea13ac1e972f049ac6e940e64e2c21",
-                    "nonce" : "0xd64c06d6a3094ee5",
+                    "hash" : "0xfe4565b25d097b3ef05c3b536efffa1c84c1f8cd33f7747d25affa0b39b7ff7c",
+                    "mixHash" : "0x0db0b0712a01f7fd1589f7ac2d494b02e794048b3e11b1b2af81e14a1103e5df",
+                    "nonce" : "0x8e585d980b9e0168",
                     "number" : "0x01",
                     "parentHash" : "0xa6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abf",
                     "receiptTrie" : "0x1833f216e9c920d4846964121760d44e99cce64fd9d2d038e4834bb247aa1ffa",
@@ -532,7 +404,7 @@
                     "transactionsTrie" : "0x03fbc93b06abfb125798b953bc7f9172f64b676c173843c35d7fa21b11dcae1e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026df901f7a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039e2844a74774a8327789bf168f97af6ac0abd677b6b84d32c609b1d087c72aaa003fbc93b06abfb125798b953bc7f9172f64b676c173843c35d7fa21b11dcae1ea01833f216e9c920d4846964121760d44e99cce64fd9d2d038e4834bb247aa1ffab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ea608203e880a02fab21fa707af28ba885f08238ef885a5cea13ac1e972f049ac6e940e64e2c2188d64c06d6a3094ee5f870f86e800182ea608080a36040600060406000600073100000000000000000000000000000000000000161c350f11ca0755ad66294d4c687d3f77294c28a3dfc6d2c0abde0dd48222f51b3f1077587f0a01f2956fdf5004c42b9cb2d2fbac8e509d8c326c2379c8f907b27d840c3a857bbc0",
+                "rlp" : "0xf9026df901f7a0a6b587f8dba1a3ac41a4d52500174b195506cc843d0fe813e50390005c876abfa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa039e2844a74774a8327789bf168f97af6ac0abd677b6b84d32c609b1d087c72aaa003fbc93b06abfb125798b953bc7f9172f64b676c173843c35d7fa21b11dcae1ea01833f216e9c920d4846964121760d44e99cce64fd9d2d038e4834bb247aa1ffab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082ea608203e880a00db0b0712a01f7fd1589f7ac2d494b02e794048b3e11b1b2af81e14a1103e5df888e585d980b9e0168f870f86e800182ea608080a36040600060406000600073100000000000000000000000000000000000000161c350f11ca0755ad66294d4c687d3f77294c28a3dfc6d2c0abde0dd48222f51b3f1077587f0a01f2956fdf5004c42b9cb2d2fbac8e509d8c326c2379c8f907b27d840c3a857bbc0",
                 "transactions" : [
                     {
                         "data" : "0x6040600060406000600073100000000000000000000000000000000000000161c350f1",
@@ -569,7 +441,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e83fc77d3037af4447bc5e67db8c646240473cd77125129d085d4ffeddbb5e4fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc856791dfc4d833a87eca102de8235505289d3f07fb9217545587964bdc9b48a",
+        "lastblockhash" : "0xfe4565b25d097b3ef05c3b536efffa1c84c1f8cd33f7747d25affa0b39b7ff7c",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
diff --git a/BlockchainTests/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit_d0g0v0.json b/BlockchainTests/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit_d0g0v0.json
index fba536841..fb9c1e2f2 100644
--- a/BlockchainTests/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit_d0g0v0.json
@@ -2,10 +2,10 @@
     "createInitFail_OOGduringInit_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit_d0g0v0Filler.json",
-            "sourceHash" : "6a8c19f618cd58ff478942b6ac4801f0c874bd5a9dcc1b9292cf9ad39545be55"
+            "sourceHash" : "f025a41645fa8a43d25b4bd5ff91243b120811d7996ca3f6436271806bac48d6"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xcf1d",
-                    "hash" : "0xf4ebcba2825e0a102eef52117897af3e08de81a4540ebe81f374f600b8abd742",
-                    "mixHash" : "0x08ddfdc3bf06a6a52f1360fce89efe226ab7d14b2c26f2c5c474dd9d3a54b2be",
-                    "nonce" : "0x065ed27d16c33bb2",
+                    "hash" : "0x03521477e9a9d3e87853bbce3e6b788c6e20405eb40d9e0094f7352970ac2397",
+                    "mixHash" : "0x442eb51b0918e6ef1eb0828ef41e5e1570d506f378e56282e61e18eab39e5ece",
+                    "nonce" : "0xf924ba2434b85637",
                     "number" : "0x01",
                     "parentHash" : "0xc67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452",
                     "receiptTrie" : "0x00b8495dc39a1867756b3962d9316b90d7e98079aaa353df03c564f919ea4e81",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x11309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f7a0c67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e2350a2158d4d013402ff76c151589280abd0727fb63d479dde3d9980bf8ce5a011309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3a000b8495dc39a1867756b3962d9316b90d7e98079aaa353df03c564f919ea4e81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082cf1d8203e880a008ddfdc3bf06a6a52f1360fce89efe226ab7d14b2c26f2c5c474dd9d3a54b2be88065ed27d16c33bb2f864f862800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca058292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7a0022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75c0",
+                "rlp" : "0xf90261f901f7a0c67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06e2350a2158d4d013402ff76c151589280abd0727fb63d479dde3d9980bf8ce5a011309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3a000b8495dc39a1867756b3962d9316b90d7e98079aaa353df03c564f919ea4e81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082cf1d8203e880a0442eb51b0918e6ef1eb0828ef41e5e1570d506f378e56282e61e18eab39e5ece88f924ba2434b85637f864f862800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca058292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7a0022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0xcf1d",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf4ebcba2825e0a102eef52117897af3e08de81a4540ebe81f374f600b8abd742",
+        "lastblockhash" : "0x03521477e9a9d3e87853bbce3e6b788c6e20405eb40d9e0094f7352970ac2397",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -109,10 +109,10 @@
     "createInitFail_OOGduringInit_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit_d0g0v0Filler.json",
-            "sourceHash" : "6a8c19f618cd58ff478942b6ac4801f0c874bd5a9dcc1b9292cf9ad39545be55"
+            "sourceHash" : "f025a41645fa8a43d25b4bd5ff91243b120811d7996ca3f6436271806bac48d6"
         },
         "blocks" : [
             {
@@ -123,9 +123,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0xcf1d",
-                    "hash" : "0xed5a5323f662d158e7eda601a0a6916f6929600668e4e53e60d3aa70f9531275",
-                    "mixHash" : "0xab66ef9c8bd87a5debb63393c77ffb064bd1f94b7f8bd3c26920c246d524f5f4",
-                    "nonce" : "0x2064ee5bee7781b7",
+                    "hash" : "0x231a932a4a694d3471dcfe68e47a16496db8b7306a268aa137226ecf9575d986",
+                    "mixHash" : "0x60f7c4710ee9e88ca306ebe3db371e34fe785aac41bf913ebda7542feaf21fa7",
+                    "nonce" : "0x5ee9de0f1205cfa7",
                     "number" : "0x01",
                     "parentHash" : "0xc67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452",
                     "receiptTrie" : "0x737a5dbc3c18897a7f7e9206228fae99838c01e328d6f2f3a6a62c7ff1788451",
@@ -134,10 +134,10 @@
                     "transactionsTrie" : "0x11309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f7a0c67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b4e4993a4524e8ce1b5fa19bd4fe532d9cc4437a9213260d64fa350203b0bf2a011309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3a0737a5dbc3c18897a7f7e9206228fae99838c01e328d6f2f3a6a62c7ff1788451b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082cf1d8203e880a0ab66ef9c8bd87a5debb63393c77ffb064bd1f94b7f8bd3c26920c246d524f5f4882064ee5bee7781b7f864f862800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca058292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7a0022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75c0",
+                "rlp" : "0xf90261f901f7a0c67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b4e4993a4524e8ce1b5fa19bd4fe532d9cc4437a9213260d64fa350203b0bf2a011309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3a0737a5dbc3c18897a7f7e9206228fae99838c01e328d6f2f3a6a62c7ff1788451b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082cf1d8203e880a060f7c4710ee9e88ca306ebe3db371e34fe785aac41bf913ebda7542feaf21fa7885ee9de0f1205cfa7f864f862800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca058292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7a0022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0xcf1d",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -171,7 +171,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xed5a5323f662d158e7eda601a0a6916f6929600668e4e53e60d3aa70f9531275",
+        "lastblockhash" : "0x231a932a4a694d3471dcfe68e47a16496db8b7306a268aa137226ecf9575d986",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -213,227 +213,13 @@
             }
         }
     },
-    "createInitFail_OOGduringInit_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit_d0g0v0Filler.json",
-            "sourceHash" : "6a8c19f618cd58ff478942b6ac4801f0c874bd5a9dcc1b9292cf9ad39545be55"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0xcf1d",
-                    "hash" : "0x674dd3b3389c4650a5059b63eb7c137cede472b1139cb3514050043aa2e0fcdf",
-                    "mixHash" : "0xc521474f9dc4f479643dbbb7738c2b38d17e4f4de925a7eeb090b8a6f6c6e453",
-                    "nonce" : "0x324d034f4c2eaa56",
-                    "number" : "0x01",
-                    "parentHash" : "0xc67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452",
-                    "receiptTrie" : "0x737a5dbc3c18897a7f7e9206228fae99838c01e328d6f2f3a6a62c7ff1788451",
-                    "stateRoot" : "0x4b4e4993a4524e8ce1b5fa19bd4fe532d9cc4437a9213260d64fa350203b0bf2",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x11309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f7a0c67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04b4e4993a4524e8ce1b5fa19bd4fe532d9cc4437a9213260d64fa350203b0bf2a011309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3a0737a5dbc3c18897a7f7e9206228fae99838c01e328d6f2f3a6a62c7ff1788451b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082cf1d8203e880a0c521474f9dc4f479643dbbb7738c2b38d17e4f4de925a7eeb090b8a6f6c6e45388324d034f4c2eaa56f864f862800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca058292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7a0022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75c0",
-                "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" : "0x674dd3b3389c4650a5059b63eb7c137cede472b1139cb3514050043aa2e0fcdf",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x605a600053600160006001f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4cf1d",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76330e3",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x605a600053600160006001f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "createInitFail_OOGduringInit_d0g0v0_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit_d0g0v0Filler.json",
-            "sourceHash" : "6a8c19f618cd58ff478942b6ac4801f0c874bd5a9dcc1b9292cf9ad39545be55"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x989680",
-                    "gasUsed" : "0x715d",
-                    "hash" : "0xd2d75b0df0596d5749a0d7d3884d6e86a6d2b8b5982a115ffc3d53dc07d98d97",
-                    "mixHash" : "0x3aad771f9415f7a14019a0ddfcee546689668eccecdb2166d5931727dba4c729",
-                    "nonce" : "0x1e90baba0e4968fc",
-                    "number" : "0x01",
-                    "parentHash" : "0xc67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452",
-                    "receiptTrie" : "0xd0f55599081d2ee531dc1264e609cc7ab8f994a9ad6879997b8a632182c10b6c",
-                    "stateRoot" : "0x6eba190c9e0e6cf68e7b13933856519a137f92e80511777ececea8898104e6b8",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x11309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f7a0c67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06eba190c9e0e6cf68e7b13933856519a137f92e80511777ececea8898104e6b8a011309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3a0d0f55599081d2ee531dc1264e609cc7ab8f994a9ad6879997b8a632182c10b6cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082715d8203e880a03aad771f9415f7a14019a0ddfcee546689668eccecdb2166d5931727dba4c729881e90baba0e4968fcf864f862800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca058292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7a0022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75c0",
-                "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" : "0xd2d75b0df0596d5749a0d7d3884d6e86a6d2b8b5982a115ffc3d53dc07d98d97",
-        "network" : "Frontier",
-        "postState" : {
-            "0x0000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4715d",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7620803",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x605a600053600160006001f0ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "createInitFail_OOGduringInit_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit_d0g0v0Filler.json",
-            "sourceHash" : "6a8c19f618cd58ff478942b6ac4801f0c874bd5a9dcc1b9292cf9ad39545be55"
+            "sourceHash" : "f025a41645fa8a43d25b4bd5ff91243b120811d7996ca3f6436271806bac48d6"
         },
         "blocks" : [
             {
@@ -444,9 +230,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x989680",
                     "gasUsed" : "0x715d",
-                    "hash" : "0x39bbf6040b7ea49fd3a4c7dcc6860d5b6e002ab3f3ebd69c22a4302b26760703",
-                    "mixHash" : "0x38d4139bd9af2d946d247d20fd89422c5a611971a4d108e84747c3448c4e2242",
-                    "nonce" : "0xcb0ca782013e68f1",
+                    "hash" : "0x5a429e7f1a0799a6f2bd8380fd6bcf0cebd6d0ffe358970180900f6217e7645e",
+                    "mixHash" : "0x471d8f1d27170a62576d1250e22b4cf6a29a5241021c6fb3ff266ab3ce86585e",
+                    "nonce" : "0x5e2e5406cbe150b7",
                     "number" : "0x01",
                     "parentHash" : "0xc67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452",
                     "receiptTrie" : "0xd0f55599081d2ee531dc1264e609cc7ab8f994a9ad6879997b8a632182c10b6c",
@@ -455,10 +241,10 @@
                     "transactionsTrie" : "0x11309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f7a0c67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06eba190c9e0e6cf68e7b13933856519a137f92e80511777ececea8898104e6b8a011309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3a0d0f55599081d2ee531dc1264e609cc7ab8f994a9ad6879997b8a632182c10b6cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082715d8203e880a038d4139bd9af2d946d247d20fd89422c5a611971a4d108e84747c3448c4e224288cb0ca782013e68f1f864f862800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca058292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7a0022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75c0",
+                "rlp" : "0xf90261f901f7a0c67f8e4343d6a3af656068890ed565f2e6af9d975d1008bb2cc8ead1f5763452a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06eba190c9e0e6cf68e7b13933856519a137f92e80511777ececea8898104e6b8a011309db4993a5bca401d57cba6c8935a76825b48bf92f92c2ec8c6abd49145c3a0d0f55599081d2ee531dc1264e609cc7ab8f994a9ad6879997b8a632182c10b6cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018398968082715d8203e880a0471d8f1d27170a62576d1250e22b4cf6a29a5241021c6fb3ff266ab3ce86585e885e2e5406cbe150b7f864f862800182cf1d94095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ca058292c95326dc6aa9439a010f5575311223728663a1e4e0fd0ae2774803557e7a0022b400032039b0f8d7454cdad95f811a1218468d216d8706c4a46297eb43a75c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0xcf1d",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -492,7 +278,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba26be8603c7a8dbae832d738290e9bcdbc83fadeea20a51073d09e51d4d3de9a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008083989680808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x39bbf6040b7ea49fd3a4c7dcc6860d5b6e002ab3f3ebd69c22a4302b26760703",
+        "lastblockhash" : "0x5a429e7f1a0799a6f2bd8380fd6bcf0cebd6d0ffe358970180900f6217e7645e",
         "network" : "Homestead",
         "postState" : {
             "0x0000000000000000000000000000000000000000" : {
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow_d0g0v0Filler.json
index 4725cd1c0..492090010 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/Call1024BalanceTooLow_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x10000000d788",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,51 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x0401",
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x0401",
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x0401",
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/Call1024PreCalls_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/Call1024PreCalls_d0g0v0Filler.json
index ccb14be73..8180b4254 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/Call1024PreCalls_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/Call1024PreCalls_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,59 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x01",
+                            "0x02" : "0x01",
+                            "0x03" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x03e4",
+                            "0x01" : "0x01",
+                            "0x02" : "0x01",
+                            "0x03" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x03e4",
+                            "0x01" : "0x01",
+                            "0x02" : "0x01",
+                            "0x03" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x03e4",
+                            "0x01" : "0x01",
+                            "0x02" : "0x01",
+                            "0x03" : "0x01"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow_d0g0v0Filler.json
index 6547cdf8f..dfe0c6ae2 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/Callcode1024BalanceTooLow_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,51 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x0401",
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x0401",
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                            "0x00" : "0x0401",
+                            "0x01" : "0x01"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1_d0g0v0Filler.json
index a228b5298..3d1732d00 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_1_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x02bf62",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,50 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x02" : "0x01",
+                            "0x05" : "0x02"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x02" : "0x01",
+                            "0x05" : "0x02"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x02" : "0x01",
+                            "0x05" : "0x02"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2_d0g0v0Filler.json
index 07cd6b428..7404fa6ae 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_2_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x024a32",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,50 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x02" : "0x01",
+                            "0x05" : "0x02"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x02" : "0x01",
+                            "0x05" : "0x02"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                            "0x02" : "0x01",
+                            "0x05" : "0x02"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer_d0g0v0Filler.json
index 368a2af24..bbea4d87b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcall_00_OOGE_valueTransfer_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,63 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000001" : {
+                        "balance" : "0x00"
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "balance" : "0x00",
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000001" : {
+                        "balance" : "0x0a"
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "balance" : "0x0a",
+                        "storage" : {
+                            "0x02" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000001" : {
+                        "balance" : "0x0a"
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "balance" : "0x0a",
+                        "storage" : {
+                            "0x02" : "0x01"
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000001" : {
+                        "balance" : "0x0a"
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "balance" : "0x0a",
+                        "storage" : {
+                            "0x02" : "0x01"
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter_d0g0v0Filler.json
index 020ea7a32..bc114ce4c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcall_000_OOGMAfter_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,95 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1_d0g0v0Filler.json
index 66c689652..b14a1f7f9 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_1_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,137 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2_d0g0v0Filler.json
index 3e7dd0a44..1c208b18a 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_2_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,137 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3_d0g0v0Filler.json
index c4883b177..e000d6606 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcallcode_001_OOGMAfter_3_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,95 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1_d0g0v0Filler.json
index 7d9fbd9cc..2febbf8f5 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_1_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,111 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2_d0g0v0Filler.json
index 0656f100a..47814267f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_2_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,111 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3_d0g0v0Filler.json
index 9527e943f..d1465d65b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecall_010_OOGMAfter_3_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,95 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1_d0g0v0Filler.json
index 132152a6d..e82fb27ce 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_1_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,111 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2_d0g0v0Filler.json
index 3849a9033..4fd8f0566 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcallcodecallcode_011_OOGMAfter_2_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,95 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1_d0g0v0Filler.json
index beabf3999..07ef801e1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_1_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,111 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2_d0g0v0Filler.json
index 91898208b..49451cc8c 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_2_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,111 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3_d0g0v0Filler.json
index 4a6c6b18d..8f84c8734 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcall_100_OOGMAfter_3_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,95 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1_d0g0v0Filler.json
index af97d4271..18594cfe1 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_1_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,79 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2_d0g0v0Filler.json
index c9b14be51..f824e068e 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_2_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,111 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3_d0g0v0Filler.json
index 90c2f8fb5..11522d5bf 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcallcode_101_OOGMAfter_3_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,111 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1_d0g0v0Filler.json
index 3586db3e5..0a7753b81 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_1_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,111 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2_d0g0v0Filler.json
index f49c85648..34161846b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_2_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,111 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3_d0g0v0Filler.json
index d93736ac6..9982db0ec 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecall_110_OOGMAfter_3_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,95 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0Filler.json
index b65fd2af2..74f906744 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_1_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,108 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0Filler.json
index 6c8fefd00..d57e59ae2 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_2_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,111 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0Filler.json
index 30ddfba09..72f096d1f 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_3_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,111 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000002" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000003" : {
+                        "storage" : {
+                        }
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json
index 3437f87cb..b37dee3da 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,63 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000000" : {
+                        "storage" : {
+                            "0x00" : "0x01"
+                        }
+                    },
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0Filler.json
index cd0a0b4a4..47da59ea6 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g0v0Filler.json
@@ -25,6 +25,71 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x00"
+                    }
+                }
+            },
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x00"
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x00"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                            "0x01" : "0x01"
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x00"
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0Filler.json
index 591953aa7..34c9bb75b 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/contractCreationMakeCallThatAskMoreGasThenTransactionProvided_d0g1v0Filler.json
@@ -25,6 +25,66 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Frontier",
+                "result" : {
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                    }
+                }
+            },
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x00"
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x00"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x1000000000000000000000000000000000000001" : {
+                        "storage" : {
+                        }
+                    },
+                    "0x6295ee1b4f6dd65047762f924ecd367c17eabf8f" : {
+                        "balance" : "0x00"
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
diff --git a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit_d0g0v0Filler.json b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit_d0g0v0Filler.json
index dee001115..bb7977531 100644
--- a/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit_d0g0v0Filler.json
+++ b/src/BlockchainTestsFiller/GeneralStateTests/stChangedEIP150/createInitFail_OOGduringInit_d0g0v0Filler.json
@@ -10,7 +10,7 @@
                 },
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0xcf1d",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -25,6 +25,64 @@
                 ]
             }
         ],
+        "expect" : [
+            {
+                "network" : "Homestead",
+                "result" : {
+                    "0x0000000000000000000000000000000000000000" : {
+                        "balance" : "0x0de0b6b3a76586a0",
+                        "code" : "",
+                        "nonce" : "0x00",
+                        "storage" : {
+                        }
+                    },
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "0x0de0b6b3a7620803"
+                    }
+                }
+            },
+            {
+                "network" : "EIP150",
+                "result" : {
+                    "0x0000000000000000000000000000000000000000" : {
+                    },
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "balance" : "0x0de0b6b3a7640000"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "0x0de0b6b3a76330e3"
+                    }
+                }
+            },
+            {
+                "network" : "Byzantium",
+                "result" : {
+                    "0x0000000000000000000000000000000000000000" : {
+                    },
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "balance" : "0x0de0b6b3a7640000"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "0x0de0b6b3a76330e3"
+                    }
+                }
+            },
+            {
+                "network" : "Constantinople",
+                "result" : {
+                    "0x0000000000000000000000000000000000000000" : {
+                    },
+                    "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
+                        "balance" : "0x0de0b6b3a7640000"
+                    },
+                    "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
+                        "balance" : "0x0de0b6b3a76330e3"
+                    }
+                }
+            }
+        ],
         "genesisBlockHeader" : {
             "bloom" : "00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
             "coinbase" : "2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",