refill blockchain stCallDelegateCodesCallCodeHomestead

author: Dimitry <dimitry@ethereum.org> 2018-01-31 21:56:50 +0800
committer: Dimitry <dimitry@ethereum.org> 2018-01-31 21:56:50 +0800
commit: 4a132816b3ff226cc17fefc71d02ae969a9afd4a (patch)
tree: 102732a9e37b9a8bb391b124e1812a531e54b5ad /BlockchainTests
parent: 37db3cd4a17596a7a9bc6488365e81d7c9743abe (diff)
download: dexon-tests-4a132816b3ff226cc17fefc71d02ae969a9afd4a.tar
dexon-tests-4a132816b3ff226cc17fefc71d02ae969a9afd4a.tar.gz
dexon-tests-4a132816b3ff226cc17fefc71d02ae969a9afd4a.tar.bz2
dexon-tests-4a132816b3ff226cc17fefc71d02ae969a9afd4a.tar.lz
dexon-tests-4a132816b3ff226cc17fefc71d02ae969a9afd4a.tar.xz
dexon-tests-4a132816b3ff226cc17fefc71d02ae969a9afd4a.tar.zst
dexon-tests-4a132816b3ff226cc17fefc71d02ae969a9afd4a.zip
58 files changed, 1161 insertions, 24657 deletions
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGE_d0g0v0.json
index 2da84ebb9..113d40b0a 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGE_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_OOGE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "f9bf4f6776d8ba791945cf8f6a3b3e3627dfaf87f15ebd2c95a823c8f1559638"
+            "sourceHash" : "2c06ccc3e219d8f91f556d27cf0c2f56f189612ec9c3471fabacd7d54d017547"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x01588f",
-                    "hash" : "0x75a0c36a2652af3fc6ebcc2e8fc0a9c7f5b2d4ac3ce99caef011e879563e134b",
-                    "mixHash" : "0x37cd47109e5f26ba7c9d0276ef3ea622294d9796d252c4de2acd04dc1f03b2bf",
-                    "nonce" : "0x2ea8304967d43d0b",
+                    "hash" : "0xc55f05927de0c4c3bcdaf76c5da51f6d716401de802a16cdd4d32836f867b51f",
+                    "mixHash" : "0x0ebe8b288cf5c1534f4c80bcdc6c6d8b1960004baf0685be3030023d90c3d8b6",
+                    "nonce" : "0x6ca81d79d955b5c7",
                     "number" : "0x01",
                     "parentHash" : "0xd343258d992ab1c1c7b73e1ae289d52e5afbb3b04d076a88d1be80e30dd64450",
                     "receiptTrie" : "0xf6d95b316df534ca539b32cd7d1efee460a09707e8daebacc70c1f459983a61a",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0d343258d992ab1c1c7b73e1ae289d52e5afbb3b04d076a88d1be80e30dd64450a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061c09355678fd6438e7d8f3dfa3371bd7c5657c36f66367ec666ec094b87dc9ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f6d95b316df534ca539b32cd7d1efee460a09707e8daebacc70c1f459983a61ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301588f8203e880a037cd47109e5f26ba7c9d0276ef3ea622294d9796d252c4de2acd04dc1f03b2bf882ea8304967d43d0bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0d343258d992ab1c1c7b73e1ae289d52e5afbb3b04d076a88d1be80e30dd64450a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061c09355678fd6438e7d8f3dfa3371bd7c5657c36f66367ec666ec094b87dc9ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f6d95b316df534ca539b32cd7d1efee460a09707e8daebacc70c1f459983a61ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301588f8203e880a00ebe8b288cf5c1534f4c80bcdc6c6d8b1960004baf0685be3030023d90c3d8b6886ca81d79d955b5c7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0050391d3f78db8f7c2e5cd33205ca3408d74c8bbb900ff3b9046a0aaa36e4e12a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x75a0c36a2652af3fc6ebcc2e8fc0a9c7f5b2d4ac3ce99caef011e879563e134b",
+        "lastblockhash" : "0xc55f05927de0c4c3bcdaf76c5da51f6d716401de802a16cdd4d32836f867b51f",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -150,315 +150,13 @@
             }
         }
     },
-    "callcallcallcode_001_OOGE_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "f9bf4f6776d8ba791945cf8f6a3b3e3627dfaf87f15ebd2c95a823c8f1559638"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x01588f",
-                    "hash" : "0x73912fb6174c811c0f7658c1ee4fb7cabe86bde15fbb9a608ebfcb64cfdfb2fa",
-                    "mixHash" : "0x84d65ae704066eaf747e57194928cd58ab1aa288e5c75f5ed2e448be88c3cbbf",
-                    "nonce" : "0x3b2b508d891bcaa5",
-                    "number" : "0x01",
-                    "parentHash" : "0xd343258d992ab1c1c7b73e1ae289d52e5afbb3b04d076a88d1be80e30dd64450",
-                    "receiptTrie" : "0x24f5c90c447f934a59d6b175ca7ccd55e0cda3cc163e5cb1c907aa64a71f57c4",
-                    "stateRoot" : "0xa5fd5376a523c9b75a0c307a88b8895fc28b832185ffc0bd8bc50f2ad691ab1d",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0d343258d992ab1c1c7b73e1ae289d52e5afbb3b04d076a88d1be80e30dd64450a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a5fd5376a523c9b75a0c307a88b8895fc28b832185ffc0bd8bc50f2ad691ab1da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea024f5c90c447f934a59d6b175ca7ccd55e0cda3cc163e5cb1c907aa64a71f57c4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301588f8203e880a084d65ae704066eaf747e57194928cd58ab1aa288e5c75f5ed2e448be88c3cbbf883b2b508d891bcaa5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xd343258d992ab1c1c7b73e1ae289d52e5afbb3b04d076a88d1be80e30dd64450",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x050391d3f78db8f7c2e5cd33205ca3408d74c8bbb900ff3b9046a0aaa36e4e12",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0050391d3f78db8f7c2e5cd33205ca3408d74c8bbb900ff3b9046a0aaa36e4e12a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x73912fb6174c811c0f7658c1ee4fb7cabe86bde15fbb9a608ebfcb64cfdfb2fa",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5588f",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762a771",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcallcallcode_001_OOGE_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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "f9bf4f6776d8ba791945cf8f6a3b3e3627dfaf87f15ebd2c95a823c8f1559638"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x01588f",
-                    "hash" : "0x5b4f10b61bce3dfaa11a5ce5271eb91b6f3640294154f898ff4072ae71489b49",
-                    "mixHash" : "0x1bbb948b570e80e4fcfaccc29b0aec58d30a9a12ba0beaee7ae5eb9bbfacb33d",
-                    "nonce" : "0x3969223417028a08",
-                    "number" : "0x01",
-                    "parentHash" : "0xd343258d992ab1c1c7b73e1ae289d52e5afbb3b04d076a88d1be80e30dd64450",
-                    "receiptTrie" : "0x24f5c90c447f934a59d6b175ca7ccd55e0cda3cc163e5cb1c907aa64a71f57c4",
-                    "stateRoot" : "0xa5fd5376a523c9b75a0c307a88b8895fc28b832185ffc0bd8bc50f2ad691ab1d",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0d343258d992ab1c1c7b73e1ae289d52e5afbb3b04d076a88d1be80e30dd64450a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a5fd5376a523c9b75a0c307a88b8895fc28b832185ffc0bd8bc50f2ad691ab1da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea024f5c90c447f934a59d6b175ca7ccd55e0cda3cc163e5cb1c907aa64a71f57c4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301588f8203e880a01bbb948b570e80e4fcfaccc29b0aec58d30a9a12ba0beaee7ae5eb9bbfacb33d883969223417028a08f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xd343258d992ab1c1c7b73e1ae289d52e5afbb3b04d076a88d1be80e30dd64450",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x050391d3f78db8f7c2e5cd33205ca3408d74c8bbb900ff3b9046a0aaa36e4e12",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0050391d3f78db8f7c2e5cd33205ca3408d74c8bbb900ff3b9046a0aaa36e4e12a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5b4f10b61bce3dfaa11a5ce5271eb91b6f3640294154f898ff4072ae71489b49",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5588f",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762a771",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcallcallcode_001_OOGE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "f9bf4f6776d8ba791945cf8f6a3b3e3627dfaf87f15ebd2c95a823c8f1559638"
+            "sourceHash" : "2c06ccc3e219d8f91f556d27cf0c2f56f189612ec9c3471fabacd7d54d017547"
         },
         "blocks" : [
             {
@@ -469,9 +167,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x023adc",
-                    "hash" : "0x832c7091fbd8c7636b408a901eef52c0992438d0c5d88de4022d01cb72122ff0",
-                    "mixHash" : "0x7990679b5b2996385b13c3afefc3ef3f235880c453afc8cac461ca174764adc5",
-                    "nonce" : "0xf658282a5d24caf9",
+                    "hash" : "0xdaf893aa4d3dfd94d0bbdb3fc5b04a3474860fc12b046f36a6b723c4f8bc1edc",
+                    "mixHash" : "0xb6daff6ba130f24a66b70b81f02f077c829947888913195d0840016ad3791441",
+                    "nonce" : "0x0c027d7785cc77a5",
                     "number" : "0x01",
                     "parentHash" : "0xd343258d992ab1c1c7b73e1ae289d52e5afbb3b04d076a88d1be80e30dd64450",
                     "receiptTrie" : "0x45c8d009609df0494df5a601625f88159db33985be040f12403e94e6277bbd93",
@@ -480,10 +178,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0d343258d992ab1c1c7b73e1ae289d52e5afbb3b04d076a88d1be80e30dd64450a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04fa36c6f8887c28ea33a2391e8dcb97b10d5b9d0a3a3f313ac2791008c36196aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea045c8d009609df0494df5a601625f88159db33985be040f12403e94e6277bbd93b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083023adc8203e880a07990679b5b2996385b13c3afefc3ef3f235880c453afc8cac461ca174764adc588f658282a5d24caf9f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0d343258d992ab1c1c7b73e1ae289d52e5afbb3b04d076a88d1be80e30dd64450a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04fa36c6f8887c28ea33a2391e8dcb97b10d5b9d0a3a3f313ac2791008c36196aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea045c8d009609df0494df5a601625f88159db33985be040f12403e94e6277bbd93b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083023adc8203e880a0b6daff6ba130f24a66b70b81f02f077c829947888913195d0840016ad3791441880c027d7785cc77a5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -517,7 +215,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0050391d3f78db8f7c2e5cd33205ca3408d74c8bbb900ff3b9046a0aaa36e4e12a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x832c7091fbd8c7636b408a901eef52c0992438d0c5d88de4022d01cb72122ff0",
+        "lastblockhash" : "0xdaf893aa4d3dfd94d0bbdb3fc5b04a3474860fc12b046f36a6b723c4f8bc1edc",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -605,10 +303,10 @@
     "callcallcallcode_001_OOGE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "f9bf4f6776d8ba791945cf8f6a3b3e3627dfaf87f15ebd2c95a823c8f1559638"
+            "sourceHash" : "2c06ccc3e219d8f91f556d27cf0c2f56f189612ec9c3471fabacd7d54d017547"
         },
         "blocks" : [
             {
@@ -619,9 +317,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150d3",
-                    "hash" : "0xe90517c1cae6e77eca04bea4b62173ebbc90acb49644ed2cd208a896e165a9ba",
-                    "mixHash" : "0xefa3fa0fada5828fecf97d68cb8cc1bfaea823e2430f8a0dfe82c9ccfc514823",
-                    "nonce" : "0x7ca876885836a4f5",
+                    "hash" : "0x0fc3ca8b393628c38039a03f23933956a112ec12028e4b2b9f85b98c84de20cc",
+                    "mixHash" : "0xe40927e4be3132cab686c434ee0b60fb473cce4377410d8575a0316445b7c6f5",
+                    "nonce" : "0x4bba6a9f812408ee",
                     "number" : "0x01",
                     "parentHash" : "0xd343258d992ab1c1c7b73e1ae289d52e5afbb3b04d076a88d1be80e30dd64450",
                     "receiptTrie" : "0x18f6124e98d388e250fb62d5977e2c03477595795f29c81c74560c8a72f0d3a1",
@@ -630,10 +328,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0d343258d992ab1c1c7b73e1ae289d52e5afbb3b04d076a88d1be80e30dd64450a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e62abe511f9f59b75f89d6b810670c9dddb3a73f9c23bb21e3647529ff58b7ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea018f6124e98d388e250fb62d5977e2c03477595795f29c81c74560c8a72f0d3a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d38203e880a0efa3fa0fada5828fecf97d68cb8cc1bfaea823e2430f8a0dfe82c9ccfc514823887ca876885836a4f5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0d343258d992ab1c1c7b73e1ae289d52e5afbb3b04d076a88d1be80e30dd64450a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e62abe511f9f59b75f89d6b810670c9dddb3a73f9c23bb21e3647529ff58b7ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea018f6124e98d388e250fb62d5977e2c03477595795f29c81c74560c8a72f0d3a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d38203e880a0e40927e4be3132cab686c434ee0b60fb473cce4377410d8575a0316445b7c6f5884bba6a9f812408eef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -667,7 +365,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0050391d3f78db8f7c2e5cd33205ca3408d74c8bbb900ff3b9046a0aaa36e4e12a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe90517c1cae6e77eca04bea4b62173ebbc90acb49644ed2cd208a896e165a9ba",
+        "lastblockhash" : "0x0fc3ca8b393628c38039a03f23933956a112ec12028e4b2b9f85b98c84de20cc",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfter_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfter_d0g0v0.json
index 695367f06..3c581cfa3 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfter_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfter_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "37f045de9e4a774ebea70d46ee77fa1cf12265cc973f0f011e9960743a5184e6"
+            "sourceHash" : "467be9f5470f5518d92b2971b91c1cc8dee09f73e5d022cac86fa7cb92604dd5"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f6",
-                    "hash" : "0x97fbb406f1aec20ec0ce568074c85a26b13824ea76093f4270f89230b00474fd",
-                    "mixHash" : "0xef9093b76e0f0fed891f0d2aa73102974ce037b8b7b1becf9481ecc0806bb80f",
-                    "nonce" : "0x3bc5dcc6345042ba",
+                    "hash" : "0x26c4a3565212fa0b57848d1985f9cdaf65c9cfd3b7719238b53704fe90c0dfe7",
+                    "mixHash" : "0x42d4c46c266b71d6348edc81f78b05f0f53b3f1441547e7c718646fd26d1eca4",
+                    "nonce" : "0x390d3f33ee40de8a",
                     "number" : "0x01",
                     "parentHash" : "0x63f03a9dae12c5d1a18d752608100faacda4095a9383cc75cbce2ef1a10e489e",
                     "receiptTrie" : "0x05fd6e125cf4882932953e984d97095e88b58aa0a28c3ac2b05f43e41afeb047",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a063f03a9dae12c5d1a18d752608100faacda4095a9383cc75cbce2ef1a10e489ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0679df7d79ca850815b1f7942d5711e84b118ae52bede432b83f1d4067ca4d108a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea005fd6e125cf4882932953e984d97095e88b58aa0a28c3ac2b05f43e41afeb047b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f68203e880a0ef9093b76e0f0fed891f0d2aa73102974ce037b8b7b1becf9481ecc0806bb80f883bc5dcc6345042baf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a063f03a9dae12c5d1a18d752608100faacda4095a9383cc75cbce2ef1a10e489ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0679df7d79ca850815b1f7942d5711e84b118ae52bede432b83f1d4067ca4d108a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea005fd6e125cf4882932953e984d97095e88b58aa0a28c3ac2b05f43e41afeb047b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f68203e880a042d4c46c266b71d6348edc81f78b05f0f53b3f1441547e7c718646fd26d1eca488390d3f33ee40de8af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0485a6f52025c76f783a581db3d094fad582aaa62f21d5741d175452b81a67dd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x97fbb406f1aec20ec0ce568074c85a26b13824ea76093f4270f89230b00474fd",
+        "lastblockhash" : "0x26c4a3565212fa0b57848d1985f9cdaf65c9cfd3b7719238b53704fe90c0dfe7",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -149,313 +149,13 @@
             }
         }
     },
-    "callcallcallcode_001_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "37f045de9e4a774ebea70d46ee77fa1cf12265cc973f0f011e9960743a5184e6"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155f6",
-                    "hash" : "0x85e17efed8a126c1e9cd477fbb6fc6c99a2af84309e86b9488abebf39bb70f23",
-                    "mixHash" : "0x8bf8495f5940864cd74abb11194aed2644ef6e6acd92d3e22f65791a5cf14f19",
-                    "nonce" : "0xc5d1857b27f475cb",
-                    "number" : "0x01",
-                    "parentHash" : "0x63f03a9dae12c5d1a18d752608100faacda4095a9383cc75cbce2ef1a10e489e",
-                    "receiptTrie" : "0xaf6da6153fd508de6ae6f5973c541dd71fa8e5f1a04be228ad6ead940a08d313",
-                    "stateRoot" : "0x36fc1cde48a007dd72ac83fadbdd74b2bb507a2afdc1f5f7777db1d3bfc7c37d",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a063f03a9dae12c5d1a18d752608100faacda4095a9383cc75cbce2ef1a10e489ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036fc1cde48a007dd72ac83fadbdd74b2bb507a2afdc1f5f7777db1d3bfc7c37da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0af6da6153fd508de6ae6f5973c541dd71fa8e5f1a04be228ad6ead940a08d313b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f68203e880a08bf8495f5940864cd74abb11194aed2644ef6e6acd92d3e22f65791a5cf14f1988c5d1857b27f475cbf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x63f03a9dae12c5d1a18d752608100faacda4095a9383cc75cbce2ef1a10e489e",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x485a6f52025c76f783a581db3d094fad582aaa62f21d5741d175452b81a67dd6",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0485a6f52025c76f783a581db3d094fad582aaa62f21d5741d175452b81a67dd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x85e17efed8a126c1e9cd477fbb6fc6c99a2af84309e86b9488abebf39bb70f23",
-        "network" : "EIP150",
-        "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_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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "37f045de9e4a774ebea70d46ee77fa1cf12265cc973f0f011e9960743a5184e6"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155f6",
-                    "hash" : "0xe9ae9c524087b1e347d086d2dca4b7c6cb7f65b5880b8cec02c0ba6b9d8dc83b",
-                    "mixHash" : "0xd561ca2299cea0a17c4e4ebde396ec28b721f26af4b5315046ce05c58efca068",
-                    "nonce" : "0xb0f0aacf58fa847f",
-                    "number" : "0x01",
-                    "parentHash" : "0x63f03a9dae12c5d1a18d752608100faacda4095a9383cc75cbce2ef1a10e489e",
-                    "receiptTrie" : "0xaf6da6153fd508de6ae6f5973c541dd71fa8e5f1a04be228ad6ead940a08d313",
-                    "stateRoot" : "0x36fc1cde48a007dd72ac83fadbdd74b2bb507a2afdc1f5f7777db1d3bfc7c37d",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a063f03a9dae12c5d1a18d752608100faacda4095a9383cc75cbce2ef1a10e489ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036fc1cde48a007dd72ac83fadbdd74b2bb507a2afdc1f5f7777db1d3bfc7c37da0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0af6da6153fd508de6ae6f5973c541dd71fa8e5f1a04be228ad6ead940a08d313b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f68203e880a0d561ca2299cea0a17c4e4ebde396ec28b721f26af4b5315046ce05c58efca06888b0f0aacf58fa847ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x63f03a9dae12c5d1a18d752608100faacda4095a9383cc75cbce2ef1a10e489e",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x485a6f52025c76f783a581db3d094fad582aaa62f21d5741d175452b81a67dd6",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0485a6f52025c76f783a581db3d094fad582aaa62f21d5741d175452b81a67dd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe9ae9c524087b1e347d086d2dca4b7c6cb7f65b5880b8cec02c0ba6b9d8dc83b",
-        "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_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "37f045de9e4a774ebea70d46ee77fa1cf12265cc973f0f011e9960743a5184e6"
+            "sourceHash" : "467be9f5470f5518d92b2971b91c1cc8dee09f73e5d022cac86fa7cb92604dd5"
         },
         "blocks" : [
             {
@@ -466,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150ce",
-                    "hash" : "0xb08e4d43df3648478ae444594939c2b65d795a85f5bd1af2827e2688862a66aa",
-                    "mixHash" : "0x62acff3705798b1fcc261e18f9f435dc6259fe3d88ebe1f91b0cce73dcc2a31c",
-                    "nonce" : "0x240d8d784104f804",
+                    "hash" : "0xe05436c0d3217e5c34ffedc0d32e271b6a51c5505b1f746d7c7db4affacfb740",
+                    "mixHash" : "0x754eb7bfd5f16441b7f8be8c63251bd29aa126eda1768f5926c5c1db72bc0db2",
+                    "nonce" : "0x6a658f0cc9de26ef",
                     "number" : "0x01",
                     "parentHash" : "0x63f03a9dae12c5d1a18d752608100faacda4095a9383cc75cbce2ef1a10e489e",
                     "receiptTrie" : "0x60ae7e81b11deabe23e5d1ef468b928319929ba86da233309de14723a1194bcf",
@@ -477,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a063f03a9dae12c5d1a18d752608100faacda4095a9383cc75cbce2ef1a10e489ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed938afa49c128465cae4f34d95098d6353ee7278a0fad8256b3a0d47c151219a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea060ae7e81b11deabe23e5d1ef468b928319929ba86da233309de14723a1194bcfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150ce8203e880a062acff3705798b1fcc261e18f9f435dc6259fe3d88ebe1f91b0cce73dcc2a31c88240d8d784104f804f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a063f03a9dae12c5d1a18d752608100faacda4095a9383cc75cbce2ef1a10e489ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed938afa49c128465cae4f34d95098d6353ee7278a0fad8256b3a0d47c151219a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea060ae7e81b11deabe23e5d1ef468b928319929ba86da233309de14723a1194bcfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150ce8203e880a0754eb7bfd5f16441b7f8be8c63251bd29aa126eda1768f5926c5c1db72bc0db2886a658f0cc9de26eff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -514,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0485a6f52025c76f783a581db3d094fad582aaa62f21d5741d175452b81a67dd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb08e4d43df3648478ae444594939c2b65d795a85f5bd1af2827e2688862a66aa",
+        "lastblockhash" : "0xe05436c0d3217e5c34ffedc0d32e271b6a51c5505b1f746d7c7db4affacfb740",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -602,10 +302,10 @@
     "callcallcallcode_001_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "37f045de9e4a774ebea70d46ee77fa1cf12265cc973f0f011e9960743a5184e6"
+            "sourceHash" : "467be9f5470f5518d92b2971b91c1cc8dee09f73e5d022cac86fa7cb92604dd5"
         },
         "blocks" : [
             {
@@ -616,9 +316,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cd",
-                    "hash" : "0xfa885789363fc42da5c0c858e6702bf3c0a59d3c14b475fb43e4ec78482b7718",
-                    "mixHash" : "0x0a1c1c3eb362befe0c49d26f733ad480f887c4e8c8c4f217b3e2a5db650f9cbb",
-                    "nonce" : "0x8a70674b8182a087",
+                    "hash" : "0xecd90a44d005a02dc40ae819a847d41fda5b1e0ac96c59a68b5a5b74fb78780b",
+                    "mixHash" : "0xed87dee267f9760ce7f4787c93fc40dac0f9e2bd577582bbd3bd96d95aa265f3",
+                    "nonce" : "0xc5b39d1272e295a1",
                     "number" : "0x01",
                     "parentHash" : "0x63f03a9dae12c5d1a18d752608100faacda4095a9383cc75cbce2ef1a10e489e",
                     "receiptTrie" : "0xc7e418a8d10c522d9ac60d1d03012cb5852135cede278d5004bcaf6ae9aa5154",
@@ -627,10 +327,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a063f03a9dae12c5d1a18d752608100faacda4095a9383cc75cbce2ef1a10e489ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d921e191af27920ed037f493f7fbed4c10ff0f240488cf1d397de78d83d65caba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c7e418a8d10c522d9ac60d1d03012cb5852135cede278d5004bcaf6ae9aa5154b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cd8203e880a00a1c1c3eb362befe0c49d26f733ad480f887c4e8c8c4f217b3e2a5db650f9cbb888a70674b8182a087f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a063f03a9dae12c5d1a18d752608100faacda4095a9383cc75cbce2ef1a10e489ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d921e191af27920ed037f493f7fbed4c10ff0f240488cf1d397de78d83d65caba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c7e418a8d10c522d9ac60d1d03012cb5852135cede278d5004bcaf6ae9aa5154b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cd8203e880a0ed87dee267f9760ce7f4787c93fc40dac0f9e2bd577582bbd3bd96d95aa265f388c5b39d1272e295a1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -664,7 +364,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0485a6f52025c76f783a581db3d094fad582aaa62f21d5741d175452b81a67dd6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfa885789363fc42da5c0c858e6702bf3c0a59d3c14b475fb43e4ec78482b7718",
+        "lastblockhash" : "0xecd90a44d005a02dc40ae819a847d41fda5b1e0ac96c59a68b5a5b74fb78780b",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBefore_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBefore_d0g0v0.json
index ae738bcb3..8ed6e8bfc 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBefore_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBefore_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_OOGMBefore_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "2bbecaf4626d7efda2be40d0b247d4522d728d6499fc5f213aba8f4c2c7768b1"
+            "sourceHash" : "08a3da361baf04134b28f80fdc92310d57b53f797a52782531b7596075fde92f"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155ed",
-                    "hash" : "0x9497d0ab2ad4fc5f0003146ecb45e9f44f5ab7f882f4d5a4cd722f0de76a0c5e",
-                    "mixHash" : "0x5112ab4e13ac9b6bd6283729065d78cd08d8783e86852b09355b3b6de087f5ba",
-                    "nonce" : "0x78af18ff98cab291",
+                    "hash" : "0x145c9ec45233a8bc7c1e561b80a831b0313a65b5a599da83c76cd7b8822a0ba6",
+                    "mixHash" : "0x15ee55d3c03363d4b0a847b0c7a30a5ac88a3325f0e5b3d7f7fc16a3803f0c73",
+                    "nonce" : "0x6749ae961d432a71",
                     "number" : "0x01",
                     "parentHash" : "0x3e73dcca03ea55a9e8f2e977e557bf74914fd8c9cb7dda3a4577683dbcbfb34a",
                     "receiptTrie" : "0xf038987e56ea14d06959646408f49b7272362f66853acec232863e5708adb8dd",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a03e73dcca03ea55a9e8f2e977e557bf74914fd8c9cb7dda3a4577683dbcbfb34aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0503a0a0c5a312a43d0e4ee362f1be867d08144098fb0fa446eff626dc604f832a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f038987e56ea14d06959646408f49b7272362f66853acec232863e5708adb8ddb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155ed8203e880a05112ab4e13ac9b6bd6283729065d78cd08d8783e86852b09355b3b6de087f5ba8878af18ff98cab291f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a03e73dcca03ea55a9e8f2e977e557bf74914fd8c9cb7dda3a4577683dbcbfb34aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0503a0a0c5a312a43d0e4ee362f1be867d08144098fb0fa446eff626dc604f832a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f038987e56ea14d06959646408f49b7272362f66853acec232863e5708adb8ddb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155ed8203e880a015ee55d3c03363d4b0a847b0c7a30a5ac88a3325f0e5b3d7f7fc16a3803f0c73886749ae961d432a71f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0363edd4458499f31e35c647d84bf3084112e442b012b438b608899d745c96adaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9497d0ab2ad4fc5f0003146ecb45e9f44f5ab7f882f4d5a4cd722f0de76a0c5e",
+        "lastblockhash" : "0x145c9ec45233a8bc7c1e561b80a831b0313a65b5a599da83c76cd7b8822a0ba6",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -149,313 +149,13 @@
             }
         }
     },
-    "callcallcallcode_001_OOGMBefore_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "2bbecaf4626d7efda2be40d0b247d4522d728d6499fc5f213aba8f4c2c7768b1"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155ed",
-                    "hash" : "0x03ad621c85b705d1ade9e409c5a74ea4306e88f6434bace3bb231ea50d1f978c",
-                    "mixHash" : "0xf3cc3f1420a67535bc7cacad294ebecdb3aca68f5cfc67972458cb05f0a85c5e",
-                    "nonce" : "0xf48f35cf27d2cce1",
-                    "number" : "0x01",
-                    "parentHash" : "0x3e73dcca03ea55a9e8f2e977e557bf74914fd8c9cb7dda3a4577683dbcbfb34a",
-                    "receiptTrie" : "0xe349605c05370a6fbde23fd71d9773990e9e98190d9f623fef37cabf63462433",
-                    "stateRoot" : "0x8402893cb49c9c15085554dec1fa4b1d97fa7924454b0b062c4e68448d8104ac",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a03e73dcca03ea55a9e8f2e977e557bf74914fd8c9cb7dda3a4577683dbcbfb34aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08402893cb49c9c15085554dec1fa4b1d97fa7924454b0b062c4e68448d8104aca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e349605c05370a6fbde23fd71d9773990e9e98190d9f623fef37cabf63462433b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155ed8203e880a0f3cc3f1420a67535bc7cacad294ebecdb3aca68f5cfc67972458cb05f0a85c5e88f48f35cf27d2cce1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x3e73dcca03ea55a9e8f2e977e557bf74914fd8c9cb7dda3a4577683dbcbfb34a",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x363edd4458499f31e35c647d84bf3084112e442b012b438b608899d745c96ada",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0363edd4458499f31e35c647d84bf3084112e442b012b438b608899d745c96adaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x03ad621c85b705d1ade9e409c5a74ea4306e88f6434bace3bb231ea50d1f978c",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c89f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555ed",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa13",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c89f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcallcallcode_001_OOGMBefore_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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "2bbecaf4626d7efda2be40d0b247d4522d728d6499fc5f213aba8f4c2c7768b1"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155ed",
-                    "hash" : "0x1c34632a693a7b82f85ee250198e094b0f457cca7134da048814c6e20e2a561c",
-                    "mixHash" : "0x3ca847c482b73c37104de40ed65950f69fc4611ebea5756641aeffbca6909ac0",
-                    "nonce" : "0xdbf1c89dd01ea147",
-                    "number" : "0x01",
-                    "parentHash" : "0x3e73dcca03ea55a9e8f2e977e557bf74914fd8c9cb7dda3a4577683dbcbfb34a",
-                    "receiptTrie" : "0xe349605c05370a6fbde23fd71d9773990e9e98190d9f623fef37cabf63462433",
-                    "stateRoot" : "0x8402893cb49c9c15085554dec1fa4b1d97fa7924454b0b062c4e68448d8104ac",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a03e73dcca03ea55a9e8f2e977e557bf74914fd8c9cb7dda3a4577683dbcbfb34aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08402893cb49c9c15085554dec1fa4b1d97fa7924454b0b062c4e68448d8104aca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e349605c05370a6fbde23fd71d9773990e9e98190d9f623fef37cabf63462433b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155ed8203e880a03ca847c482b73c37104de40ed65950f69fc4611ebea5756641aeffbca6909ac088dbf1c89dd01ea147f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x3e73dcca03ea55a9e8f2e977e557bf74914fd8c9cb7dda3a4577683dbcbfb34a",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x363edd4458499f31e35c647d84bf3084112e442b012b438b608899d745c96ada",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0363edd4458499f31e35c647d84bf3084112e442b012b438b608899d745c96adaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1c34632a693a7b82f85ee250198e094b0f457cca7134da048814c6e20e2a561c",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c89f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555ed",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa13",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c89f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcallcallcode_001_OOGMBefore_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "2bbecaf4626d7efda2be40d0b247d4522d728d6499fc5f213aba8f4c2c7768b1"
+            "sourceHash" : "08a3da361baf04134b28f80fdc92310d57b53f797a52782531b7596075fde92f"
         },
         "blocks" : [
             {
@@ -466,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150c5",
-                    "hash" : "0xe4b63a188d08dc66511fd8a6f7093378873233732e9c3faac57700bec6ef1dea",
-                    "mixHash" : "0xd0ece37b542eaf3b327733acf68be640691bd802009fe99efbf84e87d686b5ef",
-                    "nonce" : "0x2c44a9336b38e637",
+                    "hash" : "0x0f35f040f26b56a771596d262f1f630ae496c3d791c1d19c203b43b1311fe363",
+                    "mixHash" : "0x13eac610faf8aff8a723be3307efffd5e1c553b2e0fbfac1bdddca2e7e244a0b",
+                    "nonce" : "0x6feabac4465fc1c2",
                     "number" : "0x01",
                     "parentHash" : "0x3e73dcca03ea55a9e8f2e977e557bf74914fd8c9cb7dda3a4577683dbcbfb34a",
                     "receiptTrie" : "0xf13ed54b5f8b4ff5de6bc03115aecdb5fe64c35751050eef38d70c950f0ecdcb",
@@ -477,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a03e73dcca03ea55a9e8f2e977e557bf74914fd8c9cb7dda3a4577683dbcbfb34aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0948b185ed3f2a093d1ea0ea2996989f0afab399f75a3e1a45aa4d9a6fd17a8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f13ed54b5f8b4ff5de6bc03115aecdb5fe64c35751050eef38d70c950f0ecdcbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150c58203e880a0d0ece37b542eaf3b327733acf68be640691bd802009fe99efbf84e87d686b5ef882c44a9336b38e637f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a03e73dcca03ea55a9e8f2e977e557bf74914fd8c9cb7dda3a4577683dbcbfb34aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0948b185ed3f2a093d1ea0ea2996989f0afab399f75a3e1a45aa4d9a6fd17a8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f13ed54b5f8b4ff5de6bc03115aecdb5fe64c35751050eef38d70c950f0ecdcbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150c58203e880a013eac610faf8aff8a723be3307efffd5e1c553b2e0fbfac1bdddca2e7e244a0b886feabac4465fc1c2f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -514,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0363edd4458499f31e35c647d84bf3084112e442b012b438b608899d745c96adaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe4b63a188d08dc66511fd8a6f7093378873233732e9c3faac57700bec6ef1dea",
+        "lastblockhash" : "0x0f35f040f26b56a771596d262f1f630ae496c3d791c1d19c203b43b1311fe363",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -598,155 +298,5 @@
                 }
             }
         }
-    },
-    "callcallcallcode_001_OOGMBefore_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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "2bbecaf4626d7efda2be40d0b247d4522d728d6499fc5f213aba8f4c2c7768b1"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150c5",
-                    "hash" : "0x7cfef03e0241aeae8e4936c94f41e6d8b7d5a0fd85c7b11d2dfd225014d5cc46",
-                    "mixHash" : "0xb815c7b625567d923bc8d5d47b915fbe7787bd197cbe5095fb4a124cbd77b2b0",
-                    "nonce" : "0x88a4c4bc0964c690",
-                    "number" : "0x01",
-                    "parentHash" : "0x3e73dcca03ea55a9e8f2e977e557bf74914fd8c9cb7dda3a4577683dbcbfb34a",
-                    "receiptTrie" : "0xf13ed54b5f8b4ff5de6bc03115aecdb5fe64c35751050eef38d70c950f0ecdcb",
-                    "stateRoot" : "0xa0948b185ed3f2a093d1ea0ea2996989f0afab399f75a3e1a45aa4d9a6fd17a8",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a03e73dcca03ea55a9e8f2e977e557bf74914fd8c9cb7dda3a4577683dbcbfb34aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0948b185ed3f2a093d1ea0ea2996989f0afab399f75a3e1a45aa4d9a6fd17a8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f13ed54b5f8b4ff5de6bc03115aecdb5fe64c35751050eef38d70c950f0ecdcbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150c58203e880a0b815c7b625567d923bc8d5d47b915fbe7787bd197cbe5095fb4a124cbd77b2b08888a4c4bc0964c690f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x3e73dcca03ea55a9e8f2e977e557bf74914fd8c9cb7dda3a4577683dbcbfb34a",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x363edd4458499f31e35c647d84bf3084112e442b012b438b608899d745c96ada",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0363edd4458499f31e35c647d84bf3084112e442b012b438b608899d745c96adaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7cfef03e0241aeae8e4936c94f41e6d8b7d5a0fd85c7b11d2dfd225014d5cc46",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c89f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550c5",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af3b",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf7f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c89f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEnd_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEnd_d0g0v0.json
index 3a8ee6201..49d60ad5f 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEnd_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEnd_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_SuicideEnd_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "5c72fcd83e79470caf29ab73973cf45b0618f21d49ba1ad98ed9de24661af844"
+            "sourceHash" : "b51cea7810d62b176df8b5dc7c16b380785f34fc52cf33a0544b6c0225e94513"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e4",
-                    "hash" : "0x32221a1ae9cf920f8965bb3f290788400da31eccea62bc598fb0737ac7c50b0b",
-                    "mixHash" : "0x9d360cebde591ff0dc0742db762273eae2717420d2535453aa18f30324ee217d",
-                    "nonce" : "0x6d97670d752ce6e7",
+                    "hash" : "0xb9cbc37525b6fc12803edb7cbde372b55ad18870dae134fb0db36bd791448d12",
+                    "mixHash" : "0x1c3e245a0e404b43443200cc66b492e5dd5dfdcaff5a0a00ed37844bc409ae89",
+                    "nonce" : "0xc639f54a3ff14bd5",
                     "number" : "0x01",
                     "parentHash" : "0xe8e021e8a8dbb586035e683714b6e0efb830a5b6d1efc32a9fd25aff9b8672f7",
                     "receiptTrie" : "0xdfa6ff2e20e86a464bba21d71080772ef64ad6e872e20bbbc24c6bd5a5856dd0",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0e8e021e8a8dbb586035e683714b6e0efb830a5b6d1efc32a9fd25aff9b8672f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8dc4a683f0b72cf576f34c3708a66cb40e9ef23d404e519f9cbe9ef66913d01a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0dfa6ff2e20e86a464bba21d71080772ef64ad6e872e20bbbc24c6bd5a5856dd0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e48203e880a09d360cebde591ff0dc0742db762273eae2717420d2535453aa18f30324ee217d886d97670d752ce6e7f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0e8e021e8a8dbb586035e683714b6e0efb830a5b6d1efc32a9fd25aff9b8672f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8dc4a683f0b72cf576f34c3708a66cb40e9ef23d404e519f9cbe9ef66913d01a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0dfa6ff2e20e86a464bba21d71080772ef64ad6e872e20bbbc24c6bd5a5856dd0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e48203e880a01c3e245a0e404b43443200cc66b492e5dd5dfdcaff5a0a00ed37844bc409ae8988c639f54a3ff14bd5f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb34d47c75f113f9466cacc9a1fe6c67a49baa7a150e7e6fac81e3b1e33472dba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x32221a1ae9cf920f8965bb3f290788400da31eccea62bc598fb0737ac7c50b0b",
+        "lastblockhash" : "0xb9cbc37525b6fc12803edb7cbde372b55ad18870dae134fb0db36bd791448d12",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -141,297 +141,13 @@
             }
         }
     },
-    "callcallcallcode_001_SuicideEnd_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "5c72fcd83e79470caf29ab73973cf45b0618f21d49ba1ad98ed9de24661af844"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0148e4",
-                    "hash" : "0x22705c3af3f9a7cf3ff2b61535dffb7c3c4a9688a7c987fe9046f2dd14b9a382",
-                    "mixHash" : "0xbb04672cde49b5da213a5f93a1a3c7e8e9fd4f2d8e8c69bc493c543c3235ad09",
-                    "nonce" : "0xdd2563e2ae39c0cb",
-                    "number" : "0x01",
-                    "parentHash" : "0xe8e021e8a8dbb586035e683714b6e0efb830a5b6d1efc32a9fd25aff9b8672f7",
-                    "receiptTrie" : "0x2c5fdbb9a6b5e916a742fc63179a8260752d1d687708bf4b689ffaff6dbd508b",
-                    "stateRoot" : "0x2bbf48ac8a38de9ac696b3af9a1eedfae67c543c4346d83e290fefe9a2e789f1",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0e8e021e8a8dbb586035e683714b6e0efb830a5b6d1efc32a9fd25aff9b8672f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bbf48ac8a38de9ac696b3af9a1eedfae67c543c4346d83e290fefe9a2e789f1a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a02c5fdbb9a6b5e916a742fc63179a8260752d1d687708bf4b689ffaff6dbd508bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e48203e880a0bb04672cde49b5da213a5f93a1a3c7e8e9fd4f2d8e8c69bc493c543c3235ad0988dd2563e2ae39c0cbf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xe8e021e8a8dbb586035e683714b6e0efb830a5b6d1efc32a9fd25aff9b8672f7",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xeb34d47c75f113f9466cacc9a1fe6c67a49baa7a150e7e6fac81e3b1e33472db",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb34d47c75f113f9466cacc9a1fe6c67a49baa7a150e7e6fac81e3b1e33472dba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x22705c3af3f9a7cf3ff2b61535dffb7c3c4a9688a7c987fe9046f2dd14b9a382",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b5fb6fe400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000361c350f4600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548e4",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762b71c",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000361c350f4600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcallcallcode_001_SuicideEnd_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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "5c72fcd83e79470caf29ab73973cf45b0618f21d49ba1ad98ed9de24661af844"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0148e4",
-                    "hash" : "0x7e2f8f58e01d99ef6828bdd7fa65ea49270b75018d303be3a89b8f385925afd7",
-                    "mixHash" : "0xa6263564983540dfd704b436b32c85a8cc6abc800d40217ee3cc232383fdc821",
-                    "nonce" : "0x663ae8df11f9e015",
-                    "number" : "0x01",
-                    "parentHash" : "0xe8e021e8a8dbb586035e683714b6e0efb830a5b6d1efc32a9fd25aff9b8672f7",
-                    "receiptTrie" : "0x2c5fdbb9a6b5e916a742fc63179a8260752d1d687708bf4b689ffaff6dbd508b",
-                    "stateRoot" : "0x2bbf48ac8a38de9ac696b3af9a1eedfae67c543c4346d83e290fefe9a2e789f1",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0e8e021e8a8dbb586035e683714b6e0efb830a5b6d1efc32a9fd25aff9b8672f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02bbf48ac8a38de9ac696b3af9a1eedfae67c543c4346d83e290fefe9a2e789f1a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a02c5fdbb9a6b5e916a742fc63179a8260752d1d687708bf4b689ffaff6dbd508bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e48203e880a0a6263564983540dfd704b436b32c85a8cc6abc800d40217ee3cc232383fdc82188663ae8df11f9e015f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xe8e021e8a8dbb586035e683714b6e0efb830a5b6d1efc32a9fd25aff9b8672f7",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xeb34d47c75f113f9466cacc9a1fe6c67a49baa7a150e7e6fac81e3b1e33472db",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb34d47c75f113f9466cacc9a1fe6c67a49baa7a150e7e6fac81e3b1e33472dba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7e2f8f58e01d99ef6828bdd7fa65ea49270b75018d303be3a89b8f385925afd7",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b5fb6fe400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000361c350f4600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548e4",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762b71c",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000361c350f4600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcallcallcode_001_SuicideEnd_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "5c72fcd83e79470caf29ab73973cf45b0618f21d49ba1ad98ed9de24661af844"
+            "sourceHash" : "b51cea7810d62b176df8b5dc7c16b380785f34fc52cf33a0544b6c0225e94513"
         },
         "blocks" : [
             {
@@ -442,9 +158,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x023adc",
-                    "hash" : "0x2098454779925b13343c90f945845ecacbcc6bd4faf6ddcf0e62347d139efb5a",
-                    "mixHash" : "0xb0281dca61f635ecb0be2e953ca0821cd8a1ebc7d4acbbe262340b4fd92b7736",
-                    "nonce" : "0x31f6777c422eb56a",
+                    "hash" : "0x611b7e6dfe9366163521f09cc2fa2c95e3ad4e380f538e9684bc32df3e78ce39",
+                    "mixHash" : "0xe5e8e8c14df107cee6e8c5d336a8f77acdda33faa84bef6c287e40c411014c7e",
+                    "nonce" : "0xb755cf06f4e09aed",
                     "number" : "0x01",
                     "parentHash" : "0xe8e021e8a8dbb586035e683714b6e0efb830a5b6d1efc32a9fd25aff9b8672f7",
                     "receiptTrie" : "0x4aa980518f72102ca9ca9a5022e3cf2d026ae504a7b93f74c722cf7ef8652c8b",
@@ -453,10 +169,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0e8e021e8a8dbb586035e683714b6e0efb830a5b6d1efc32a9fd25aff9b8672f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a74d8f36927ae9763860347cd64320af7c751d779e760c69ca87acf747d5aa4da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a04aa980518f72102ca9ca9a5022e3cf2d026ae504a7b93f74c722cf7ef8652c8bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083023adc8203e880a0b0281dca61f635ecb0be2e953ca0821cd8a1ebc7d4acbbe262340b4fd92b77368831f6777c422eb56af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0e8e021e8a8dbb586035e683714b6e0efb830a5b6d1efc32a9fd25aff9b8672f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a74d8f36927ae9763860347cd64320af7c751d779e760c69ca87acf747d5aa4da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a04aa980518f72102ca9ca9a5022e3cf2d026ae504a7b93f74c722cf7ef8652c8bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083023adc8203e880a0e5e8e8c14df107cee6e8c5d336a8f77acdda33faa84bef6c287e40c411014c7e88b755cf06f4e09aedf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -490,7 +206,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb34d47c75f113f9466cacc9a1fe6c67a49baa7a150e7e6fac81e3b1e33472dba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2098454779925b13343c90f945845ecacbcc6bd4faf6ddcf0e62347d139efb5a",
+        "lastblockhash" : "0x611b7e6dfe9366163521f09cc2fa2c95e3ad4e380f538e9684bc32df3e78ce39",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -574,147 +290,5 @@
                 }
             }
         }
-    },
-    "callcallcallcode_001_SuicideEnd_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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "5c72fcd83e79470caf29ab73973cf45b0618f21d49ba1ad98ed9de24661af844"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x012da0",
-                    "hash" : "0x09d69875fa73cc3d7d573645803d50ab906f9f9d5f4611fb8de154160fb4fe4d",
-                    "mixHash" : "0xe42c07bac425a48fc59ab188493906d624296708e91c213362570d53fe79bdcd",
-                    "nonce" : "0xe3646e6edd613727",
-                    "number" : "0x01",
-                    "parentHash" : "0xe8e021e8a8dbb586035e683714b6e0efb830a5b6d1efc32a9fd25aff9b8672f7",
-                    "receiptTrie" : "0x25c4fc77ab839ab2ca1565e18d3d2ac1c8b9ef8089a63cabf8c5f72e949ed27f",
-                    "stateRoot" : "0x6600c88aad6303ea311998e263530f67edfc654d860f2bba263638363424ecbf",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0e8e021e8a8dbb586035e683714b6e0efb830a5b6d1efc32a9fd25aff9b8672f7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06600c88aad6303ea311998e263530f67edfc654d860f2bba263638363424ecbfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a025c4fc77ab839ab2ca1565e18d3d2ac1c8b9ef8089a63cabf8c5f72e949ed27fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da08203e880a0e42c07bac425a48fc59ab188493906d624296708e91c213362570d53fe79bdcd88e3646e6edd613727f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xe8e021e8a8dbb586035e683714b6e0efb830a5b6d1efc32a9fd25aff9b8672f7",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xeb34d47c75f113f9466cacc9a1fe6c67a49baa7a150e7e6fac81e3b1e33472db",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb34d47c75f113f9466cacc9a1fe6c67a49baa7a150e7e6fac81e3b1e33472dba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x09d69875fa73cc3d7d573645803d50ab906f9f9d5f4611fb8de154160fb4fe4d",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b5fb6fe400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000361c350f4600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f52da0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762d260",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000361c350f4600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle_d0g0v0.json
index 7ee62a58f..9f0222f7f 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_SuicideMiddle_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "c10bbc183a8a75e04af345426d3abf7970ca3f36679986c9483735f843fb38ac"
+            "sourceHash" : "19baea5e371314c69b5d82bb92cebc0855b50ae389168d79cd97920a1355b25e"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c7",
-                    "hash" : "0xdcbc4088bea517ab181b58b1c1c05043a4f39ce7342b1e2113f515c05700d743",
-                    "mixHash" : "0x21407f96dd398a39094d416de2c7abb2c3329040982e0892c021b8065863faeb",
-                    "nonce" : "0x7fff7fe53919768f",
+                    "hash" : "0xb91381f553ac5c48b35ad297d12bf201ab744bd3a9084d301b6a030dcf523f3f",
+                    "mixHash" : "0x653dd7416bdcb26afa8b9ff2851c9b5d9b4d54e6839e41f82000bb4c95bb52a7",
+                    "nonce" : "0xa96fcd781a35b838",
                     "number" : "0x01",
                     "parentHash" : "0x65bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5",
                     "receiptTrie" : "0x09430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a065bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036cc5898fd1ab0eb027d39d108d36851df48724dfeee459d49dc02c1179eca9ba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a021407f96dd398a39094d416de2c7abb2c3329040982e0892c021b8065863faeb887fff7fe53919768ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a065bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036cc5898fd1ab0eb027d39d108d36851df48724dfeee459d49dc02c1179eca9ba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a009430c47ad57170f4a897ec85dfeb6757301084dd1b8169f5e0a0712a40057c0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a0653dd7416bdcb26afa8b9ff2851c9b5d9b4d54e6839e41f82000bb4c95bb52a788a96fcd781a35b838f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d0e51486c42278c7f4814f8897083d0bbc4a25cda3f1d8d24361110a149dc05ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdcbc4088bea517ab181b58b1c1c05043a4f39ce7342b1e2113f515c05700d743",
+        "lastblockhash" : "0xb91381f553ac5c48b35ad297d12bf201ab744bd3a9084d301b6a030dcf523f3f",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -141,297 +141,13 @@
             }
         }
     },
-    "callcallcallcode_001_SuicideMiddle_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "c10bbc183a8a75e04af345426d3abf7970ca3f36679986c9483735f843fb38ac"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c7",
-                    "hash" : "0x9b04fd3052288ae26d6c06a52fe137bde536ff71c662b6eb85f99b0f4c67c425",
-                    "mixHash" : "0x58eda0829e71aa1ab230660a012ffa6083f43400f901410b3c1b0a3ea18e60c4",
-                    "nonce" : "0x952a3d33c3e18909",
-                    "number" : "0x01",
-                    "parentHash" : "0x65bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5",
-                    "receiptTrie" : "0xea1af5c5db83a4c4e496ee107ee971b43165baf6469a7bbb31872fffecc4ed3d",
-                    "stateRoot" : "0x421cc897cf14202745385e38ab5a21ef2af99f25a988e9176c921c6b8b38d446",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a065bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0421cc897cf14202745385e38ab5a21ef2af99f25a988e9176c921c6b8b38d446a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0ea1af5c5db83a4c4e496ee107ee971b43165baf6469a7bbb31872fffecc4ed3db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a058eda0829e71aa1ab230660a012ffa6083f43400f901410b3c1b0a3ea18e60c488952a3d33c3e18909f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x65bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xd0e51486c42278c7f4814f8897083d0bbc4a25cda3f1d8d24361110a149dc05e",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d0e51486c42278c7f4814f8897083d0bbc4a25cda3f1d8d24361110a149dc05ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9b04fd3052288ae26d6c06a52fe137bde536ff71c662b6eb85f99b0f4c67c425",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c7",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7635639",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcallcallcode_001_SuicideMiddle_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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "c10bbc183a8a75e04af345426d3abf7970ca3f36679986c9483735f843fb38ac"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c7",
-                    "hash" : "0x5e2dc2484fef5a9314bf4ae2e70c78367c82c4019b12e0dcc2ada39ecfe923b2",
-                    "mixHash" : "0x5b0e60a842ca6847ac8e836ad82ea7584039c221f5421fec306b95b8a047c061",
-                    "nonce" : "0xfe0f54eb75539a29",
-                    "number" : "0x01",
-                    "parentHash" : "0x65bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5",
-                    "receiptTrie" : "0xea1af5c5db83a4c4e496ee107ee971b43165baf6469a7bbb31872fffecc4ed3d",
-                    "stateRoot" : "0x421cc897cf14202745385e38ab5a21ef2af99f25a988e9176c921c6b8b38d446",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a065bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0421cc897cf14202745385e38ab5a21ef2af99f25a988e9176c921c6b8b38d446a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0ea1af5c5db83a4c4e496ee107ee971b43165baf6469a7bbb31872fffecc4ed3db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c78203e880a05b0e60a842ca6847ac8e836ad82ea7584039c221f5421fec306b95b8a047c06188fe0f54eb75539a29f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x65bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xd0e51486c42278c7f4814f8897083d0bbc4a25cda3f1d8d24361110a149dc05e",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d0e51486c42278c7f4814f8897083d0bbc4a25cda3f1d8d24361110a149dc05ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5e2dc2484fef5a9314bf4ae2e70c78367c82c4019b12e0dcc2ada39ecfe923b2",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c7",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7635639",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcallcallcode_001_SuicideMiddle_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "c10bbc183a8a75e04af345426d3abf7970ca3f36679986c9483735f843fb38ac"
+            "sourceHash" : "19baea5e371314c69b5d82bb92cebc0855b50ae389168d79cd97920a1355b25e"
         },
         "blocks" : [
             {
@@ -442,9 +158,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x9117",
-                    "hash" : "0x139a1591099a564b1f172bebfda473c5185a8c627178a0dfecc318decb8b4643",
-                    "mixHash" : "0x878d90d334ba1304dc3d7cbbee709736bd2437dbf4b5c57cf419060e08dedfd5",
-                    "nonce" : "0x2489b137e9e10033",
+                    "hash" : "0x708d647e099fdb1ba75192a6e5e7b2dacbabc53cb73a630c99a35e4d8e5ec665",
+                    "mixHash" : "0x3055c3d28f9f0f2a74e0979843d3493972b37129a3302b3d4495afe5f3fe0dbc",
+                    "nonce" : "0xa932624449d897ae",
                     "number" : "0x01",
                     "parentHash" : "0x65bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5",
                     "receiptTrie" : "0x4fb0b023b94e0e6650633a5d31dae5366295c532164aee6d714bbebeb6b260f3",
@@ -453,10 +169,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a065bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da786951fe0e580920dc66fa672f4c09f2f9961432e02ed76d602a729985bb34a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a04fb0b023b94e0e6650633a5d31dae5366295c532164aee6d714bbebeb6b260f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0878d90d334ba1304dc3d7cbbee709736bd2437dbf4b5c57cf419060e08dedfd5882489b137e9e10033f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a065bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da786951fe0e580920dc66fa672f4c09f2f9961432e02ed76d602a729985bb34a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a04fb0b023b94e0e6650633a5d31dae5366295c532164aee6d714bbebeb6b260f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a03055c3d28f9f0f2a74e0979843d3493972b37129a3302b3d4495afe5f3fe0dbc88a932624449d897aef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -490,7 +206,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d0e51486c42278c7f4814f8897083d0bbc4a25cda3f1d8d24361110a149dc05ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x139a1591099a564b1f172bebfda473c5185a8c627178a0dfecc318decb8b4643",
+        "lastblockhash" : "0x708d647e099fdb1ba75192a6e5e7b2dacbabc53cb73a630c99a35e4d8e5ec665",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -566,147 +282,5 @@
                 }
             }
         }
-    },
-    "callcallcallcode_001_SuicideMiddle_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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "c10bbc183a8a75e04af345426d3abf7970ca3f36679986c9483735f843fb38ac"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x9117",
-                    "hash" : "0xa6b43f0ec065062ef51b0e9f17fb9ecd1ea3c34bb800b7f357c72eafaa3aa4b3",
-                    "mixHash" : "0xaf4e73234ad24ba2662433356058953021e63517fd572c152b48478b526271a1",
-                    "nonce" : "0xd870eedc8636bb71",
-                    "number" : "0x01",
-                    "parentHash" : "0x65bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5",
-                    "receiptTrie" : "0x4fb0b023b94e0e6650633a5d31dae5366295c532164aee6d714bbebeb6b260f3",
-                    "stateRoot" : "0xda786951fe0e580920dc66fa672f4c09f2f9961432e02ed76d602a729985bb34",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a065bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da786951fe0e580920dc66fa672f4c09f2f9961432e02ed76d602a729985bb34a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a04fb0b023b94e0e6650633a5d31dae5366295c532164aee6d714bbebeb6b260f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291178203e880a0af4e73234ad24ba2662433356058953021e63517fd572c152b48478b526271a188d870eedc8636bb71f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x65bfcd329bcf9af6f743f523ff7530bacc26e153a0bb4928ce7dc1455a4c2ce5",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xd0e51486c42278c7f4814f8897083d0bbc4a25cda3f1d8d24361110a149dc05e",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d0e51486c42278c7f4814f8897083d0bbc4a25cda3f1d8d24361110a149dc05ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa6b43f0ec065062ef51b0e9f17fb9ecd1ea3c34bb800b7f357c72eafaa3aa4b3",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49117",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7636ee9",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_d0g0v0.json
index 24f34a8b0..1c6f065a6 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcallcode_001_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_d0g0v0Filler.json",
-            "sourceHash" : "28ce197565a75f6e94a8ba32ee4b8c20617b49106092e19e491650252b9f90a2"
+            "sourceHash" : "171a34d463941b5a193db4327e0fce4c8926b8c438d0382fa2e2181dbe2fbfd7"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03ea74",
-                    "hash" : "0xdb49532cc3d442bb6d4ccea350e2e0ea95005b9e115c305688ff6b7fa7b1e03a",
-                    "mixHash" : "0x2c3bc0b8155a1d2a6c00d8701cec33c3a363abf998e154a2f13f1221ccd955e7",
-                    "nonce" : "0x537ada49c6584d1a",
+                    "hash" : "0xbac36e64ffa9e350d8a0fa1e4aea6ceab9ef25f7882c9ae8953606f57ca4c84f",
+                    "mixHash" : "0xe935b88cf0c6558cf5df9e8361f57b767387336df23287c63c13de204e9c40a1",
+                    "nonce" : "0xd94a5cb2ef9e1109",
                     "number" : "0x01",
                     "parentHash" : "0x16eb8be1a17f64c99c452b4aafe6eb488ce35d99b1cb2d382be8ee02e159d9d2",
                     "receiptTrie" : "0xb04f56009e6eb8fecf758faf1a93509e10610ee15597b6e50a6d97b51de3cda8",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a016eb8be1a17f64c99c452b4aafe6eb488ce35d99b1cb2d382be8ee02e159d9d2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02125b3a7ea3734bad292941277d7d6017f20bfaf03aa71fc43e3d202bf6c225aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0b04f56009e6eb8fecf758faf1a93509e10610ee15597b6e50a6d97b51de3cda8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303ea748203e880a02c3bc0b8155a1d2a6c00d8701cec33c3a363abf998e154a2f13f1221ccd955e788537ada49c6584d1af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a016eb8be1a17f64c99c452b4aafe6eb488ce35d99b1cb2d382be8ee02e159d9d2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02125b3a7ea3734bad292941277d7d6017f20bfaf03aa71fc43e3d202bf6c225aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0b04f56009e6eb8fecf758faf1a93509e10610ee15597b6e50a6d97b51de3cda8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303ea748203e880a0e935b88cf0c6558cf5df9e8361f57b767387336df23287c63c13de204e9c40a188d94a5cb2ef9e1109f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e6afc22080d32ac167b13bc96665fd9774ae2bf6cfc6e498d72c96b8e18a0939a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdb49532cc3d442bb6d4ccea350e2e0ea95005b9e115c305688ff6b7fa7b1e03a",
+        "lastblockhash" : "0xbac36e64ffa9e350d8a0fa1e4aea6ceab9ef25f7882c9ae8953606f57ca4c84f",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -159,333 +159,13 @@
             }
         }
     },
-    "callcallcallcode_001_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_d0g0v0Filler.json",
-            "sourceHash" : "28ce197565a75f6e94a8ba32ee4b8c20617b49106092e19e491650252b9f90a2"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x03ea74",
-                    "hash" : "0x70113483e211f4799e07c5e0de4748162788c8a2a5b90e07b516a5aa56c80d39",
-                    "mixHash" : "0xefda6f24641a3240e59fcd4e28e68e95a3e004ef99672cb26a737660e39bda05",
-                    "nonce" : "0xf46d71e5a3e63ab7",
-                    "number" : "0x01",
-                    "parentHash" : "0x16eb8be1a17f64c99c452b4aafe6eb488ce35d99b1cb2d382be8ee02e159d9d2",
-                    "receiptTrie" : "0xd1c9520912c1dbe3a4b7c8ba31da777cc15680b2cc739f26f7e4b24e8f742966",
-                    "stateRoot" : "0x07f4fcb86cd2571fa47d19e05b7376eebe485db863305926ba99e742c781786e",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a016eb8be1a17f64c99c452b4aafe6eb488ce35d99b1cb2d382be8ee02e159d9d2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa007f4fcb86cd2571fa47d19e05b7376eebe485db863305926ba99e742c781786ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d1c9520912c1dbe3a4b7c8ba31da777cc15680b2cc739f26f7e4b24e8f742966b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303ea748203e880a0efda6f24641a3240e59fcd4e28e68e95a3e004ef99672cb26a737660e39bda0588f46d71e5a3e63ab7f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x16eb8be1a17f64c99c452b4aafe6eb488ce35d99b1cb2d382be8ee02e159d9d2",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe6afc22080d32ac167b13bc96665fd9774ae2bf6cfc6e498d72c96b8e18a0939",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e6afc22080d32ac167b13bc96665fd9774ae2bf6cfc6e498d72c96b8e18a0939a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x70113483e211f4799e07c5e0de4748162788c8a2a5b90e07b516a5aa56c80d39",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x014a" : "0x1000000000000000000000000000000000000000",
-                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x0150" : "0x40",
-                    "0x0152" : "0x26",
-                    "0x0154" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01",
-                    "0x04" : "0x1000000000000000000000000000000000000000",
-                    "0x05" : "0x02"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000036203d090f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346005553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f7ea74",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a760158c",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000036203d090f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346005553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcallcallcode_001_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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_d0g0v0Filler.json",
-            "sourceHash" : "28ce197565a75f6e94a8ba32ee4b8c20617b49106092e19e491650252b9f90a2"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x03ea74",
-                    "hash" : "0x18a2822c8ffa1da8c6806bb391a94592a2283dd1134949ebcb4240b8271753d9",
-                    "mixHash" : "0xa0d9fb50acaec3784e98eddd4aa516e46ae593d1212e57f8b4e3bff06f5f809b",
-                    "nonce" : "0xd949bafff951df73",
-                    "number" : "0x01",
-                    "parentHash" : "0x16eb8be1a17f64c99c452b4aafe6eb488ce35d99b1cb2d382be8ee02e159d9d2",
-                    "receiptTrie" : "0xd1c9520912c1dbe3a4b7c8ba31da777cc15680b2cc739f26f7e4b24e8f742966",
-                    "stateRoot" : "0x07f4fcb86cd2571fa47d19e05b7376eebe485db863305926ba99e742c781786e",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a016eb8be1a17f64c99c452b4aafe6eb488ce35d99b1cb2d382be8ee02e159d9d2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa007f4fcb86cd2571fa47d19e05b7376eebe485db863305926ba99e742c781786ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d1c9520912c1dbe3a4b7c8ba31da777cc15680b2cc739f26f7e4b24e8f742966b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303ea748203e880a0a0d9fb50acaec3784e98eddd4aa516e46ae593d1212e57f8b4e3bff06f5f809b88d949bafff951df73f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x16eb8be1a17f64c99c452b4aafe6eb488ce35d99b1cb2d382be8ee02e159d9d2",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe6afc22080d32ac167b13bc96665fd9774ae2bf6cfc6e498d72c96b8e18a0939",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e6afc22080d32ac167b13bc96665fd9774ae2bf6cfc6e498d72c96b8e18a0939a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x18a2822c8ffa1da8c6806bb391a94592a2283dd1134949ebcb4240b8271753d9",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x014a" : "0x1000000000000000000000000000000000000000",
-                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x0150" : "0x40",
-                    "0x0152" : "0x26",
-                    "0x0154" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01",
-                    "0x04" : "0x1000000000000000000000000000000000000000",
-                    "0x05" : "0x02"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000036203d090f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346005553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f7ea74",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a760158c",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006002731000000000000000000000000000000000000002620493e0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000036203d090f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346005553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcallcallcode_001_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_d0g0v0Filler.json",
-            "sourceHash" : "28ce197565a75f6e94a8ba32ee4b8c20617b49106092e19e491650252b9f90a2"
+            "sourceHash" : "171a34d463941b5a193db4327e0fce4c8926b8c438d0382fa2e2181dbe2fbfd7"
         },
         "blocks" : [
             {
@@ -496,9 +176,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x058570",
-                    "hash" : "0xbb99301c00447a27ca3791a5d1b4fc1765be1d0a34cb5e3385e90879aded360b",
-                    "mixHash" : "0xcc551fee33c541a6069afe494178ee9720f66d572fb78f92379b65861bb66ac0",
-                    "nonce" : "0x3c5bc18c5fead668",
+                    "hash" : "0x10220c354ac367fe7d5777466ae1db209aa66179c971fc453c1c028592418514",
+                    "mixHash" : "0x62a9e622c2b6acd2d4e58246e9e2195aa23267984ed9df951eaa53aa224467ed",
+                    "nonce" : "0xc501860703b63457",
                     "number" : "0x01",
                     "parentHash" : "0x16eb8be1a17f64c99c452b4aafe6eb488ce35d99b1cb2d382be8ee02e159d9d2",
                     "receiptTrie" : "0x7d3ca3606d1c0f86355700f6ba7abd64b93ca820234d65d1ccec74111dc543f7",
@@ -507,10 +187,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a016eb8be1a17f64c99c452b4aafe6eb488ce35d99b1cb2d382be8ee02e159d9d2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa007ba1d037661dbf59b788cee346c6d022ac5b4d9c3256c282b3fc22a79f82020a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a07d3ca3606d1c0f86355700f6ba7abd64b93ca820234d65d1ccec74111dc543f7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830585708203e880a0cc551fee33c541a6069afe494178ee9720f66d572fb78f92379b65861bb66ac0883c5bc18c5fead668f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a016eb8be1a17f64c99c452b4aafe6eb488ce35d99b1cb2d382be8ee02e159d9d2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa007ba1d037661dbf59b788cee346c6d022ac5b4d9c3256c282b3fc22a79f82020a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a07d3ca3606d1c0f86355700f6ba7abd64b93ca820234d65d1ccec74111dc543f7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830585708203e880a062a9e622c2b6acd2d4e58246e9e2195aa23267984ed9df951eaa53aa224467ed88c501860703b63457f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -544,7 +224,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e6afc22080d32ac167b13bc96665fd9774ae2bf6cfc6e498d72c96b8e18a0939a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbb99301c00447a27ca3791a5d1b4fc1765be1d0a34cb5e3385e90879aded360b",
+        "lastblockhash" : "0x10220c354ac367fe7d5777466ae1db209aa66179c971fc453c1c028592418514",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -632,10 +312,10 @@
     "callcallcallcode_001_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_001_d0g0v0Filler.json",
-            "sourceHash" : "28ce197565a75f6e94a8ba32ee4b8c20617b49106092e19e491650252b9f90a2"
+            "sourceHash" : "171a34d463941b5a193db4327e0fce4c8926b8c438d0382fa2e2181dbe2fbfd7"
         },
         "blocks" : [
             {
@@ -646,9 +326,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03e2b8",
-                    "hash" : "0x1feb55d286cad553273bdcbd032fec96efebe8795033dbfa094c91cff768bbbe",
-                    "mixHash" : "0x1dbaf14053e4117a5535e8ee0b16b80a5c43a82cf2a64d4155b9571e6097d6d9",
-                    "nonce" : "0x60411ac858a95e4b",
+                    "hash" : "0xfc918a4f299fc15b909ed7aa6f6596b30140b4f033cffc8befbe70ac719c7a78",
+                    "mixHash" : "0x7ca3537cce71ca92c2f8e96586c39959d037bfe36e43c64c5501e6394e723a8f",
+                    "nonce" : "0x71343b2b860015e6",
                     "number" : "0x01",
                     "parentHash" : "0x16eb8be1a17f64c99c452b4aafe6eb488ce35d99b1cb2d382be8ee02e159d9d2",
                     "receiptTrie" : "0x1ca2ec1f61e4be75141e2769f89711262b02fe27243592a475d2ea74e80e70ef",
@@ -657,10 +337,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a016eb8be1a17f64c99c452b4aafe6eb488ce35d99b1cb2d382be8ee02e159d9d2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc8391d6847fcd7036dc1fba9313a4b83aac59a94377f8be3527180d885cf153a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01ca2ec1f61e4be75141e2769f89711262b02fe27243592a475d2ea74e80e70efb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303e2b88203e880a01dbaf14053e4117a5535e8ee0b16b80a5c43a82cf2a64d4155b9571e6097d6d98860411ac858a95e4bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a016eb8be1a17f64c99c452b4aafe6eb488ce35d99b1cb2d382be8ee02e159d9d2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc8391d6847fcd7036dc1fba9313a4b83aac59a94377f8be3527180d885cf153a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a01ca2ec1f61e4be75141e2769f89711262b02fe27243592a475d2ea74e80e70efb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303e2b88203e880a07ca3537cce71ca92c2f8e96586c39959d037bfe36e43c64c5501e6394e723a8f8871343b2b860015e6f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -694,7 +374,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e6afc22080d32ac167b13bc96665fd9774ae2bf6cfc6e498d72c96b8e18a0939a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1feb55d286cad553273bdcbd032fec96efebe8795033dbfa094c91cff768bbbe",
+        "lastblockhash" : "0xfc918a4f299fc15b909ed7aa6f6596b30140b4f033cffc8befbe70ac719c7a78",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVE_d0g0v0.json
index 2d54659b8..b871973cf 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVE_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcallcode_ABCB_RECURSIVE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "60948db9691280d2ec800157e58d50d2654fe1e02c01a2f0426c56a64c4d5b2c"
+            "sourceHash" : "9dc82826751c1d733151b86172352bdc35baa537aa7a2f7f8109cc26e0218ba0"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7b",
-                    "hash" : "0x65cd386660236f12854243967398a18b8b70efaa4a9e53a8f71d21ed4c69836a",
-                    "mixHash" : "0x14806833031e90ebc0b874e011c3906dd446c7127c451c8b72affcf70abd5748",
-                    "nonce" : "0x3de916c6ec7ec3bb",
+                    "hash" : "0x133e54e70e2b4390fda18d19ca61ce69f0faf09db3b2e8ce6e7e4174a5a9c7bc",
+                    "mixHash" : "0x6e87091f849a6867be6b22576f62f8eb59de03ed710e9ee87bf5d3a370990742",
+                    "nonce" : "0x77357fe74832a677",
                     "number" : "0x01",
                     "parentHash" : "0x7cef7660ca7b844c05919e3a2f6e18e219cbdb8e8ff704e8215c93e40704f504",
                     "receiptTrie" : "0x63a01b86e4342726a564a98d55dac51745ef3a32d1a9d5515f4a6e0762a84fa3",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a07cef7660ca7b844c05919e3a2f6e18e219cbdb8e8ff704e8215c93e40704f504a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07bfcf0f9db58442ee4380d241b5c325a32f47df71e1fa418d8764aaae1ffafd8a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a063a01b86e4342726a564a98d55dac51745ef3a32d1a9d5515f4a6e0762a84fa3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7b8203e880a014806833031e90ebc0b874e011c3906dd446c7127c451c8b72affcf70abd5748883de916c6ec7ec3bbf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a07cef7660ca7b844c05919e3a2f6e18e219cbdb8e8ff704e8215c93e40704f504a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07bfcf0f9db58442ee4380d241b5c325a32f47df71e1fa418d8764aaae1ffafd8a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a063a01b86e4342726a564a98d55dac51745ef3a32d1a9d5515f4a6e0762a84fa3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7b8203e880a06e87091f849a6867be6b22576f62f8eb59de03ed710e9ee87bf5d3a3709907428877357fe74832a677f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b796e810c641ec7c5d9c7db3f419843068a401dd525ef70c9f177e5e1ce58399a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x65cd386660236f12854243967398a18b8b70efaa4a9e53a8f71d21ed4c69836a",
+        "lastblockhash" : "0x133e54e70e2b4390fda18d19ca61ce69f0faf09db3b2e8ce6e7e4174a5a9c7bc",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -136,287 +136,13 @@
             }
         }
     },
-    "callcallcallcode_ABCB_RECURSIVE_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "60948db9691280d2ec800157e58d50d2654fe1e02c01a2f0426c56a64c4d5b2c"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08ab7b",
-                    "hash" : "0x6847cf9c8fc8f062d6ecc24401929308b1a6a414d0e01a1abc57351afd3cac22",
-                    "mixHash" : "0x9e3c8c6e31a0fd41afdea7008762bc62268c255068ea181a9b9bf7cce929c205",
-                    "nonce" : "0x89eca8280e054137",
-                    "number" : "0x01",
-                    "parentHash" : "0x7cef7660ca7b844c05919e3a2f6e18e219cbdb8e8ff704e8215c93e40704f504",
-                    "receiptTrie" : "0xf4c7252d39dc71c1bda99a4184b223c05cb76801d7b7e3e524fa6d7a4a1c7256",
-                    "stateRoot" : "0x05fb9ecfee87e1c5dad24b6c663dbc5066473cdbc49fcec76c06c8aef5dc2a66",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f9a07cef7660ca7b844c05919e3a2f6e18e219cbdb8e8ff704e8215c93e40704f504a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005fb9ecfee87e1c5dad24b6c663dbc5066473cdbc49fcec76c06c8aef5dc2a66a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0f4c7252d39dc71c1bda99a4184b223c05cb76801d7b7e3e524fa6d7a4a1c7256b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7b8203e880a09e3c8c6e31a0fd41afdea7008762bc62268c255068ea181a9b9bf7cce929c2058889eca8280e054137f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x01c9c380",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
-                        "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0xb2d05e00",
-            "gasUsed" : "0x00",
-            "hash" : "0x7cef7660ca7b844c05919e3a2f6e18e219cbdb8e8ff704e8215c93e40704f504",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb796e810c641ec7c5d9c7db3f419843068a401dd525ef70c9f177e5e1ce58399",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b796e810c641ec7c5d9c7db3f419843068a401dd525ef70c9f177e5e1ce58399a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6847cf9c8fc8f062d6ecc24401929308b1a6a414d0e01a1abc57351afd3cac22",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000016207a120f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fcab7b",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5485",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000016207a120f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcallcallcode_ABCB_RECURSIVE_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/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "60948db9691280d2ec800157e58d50d2654fe1e02c01a2f0426c56a64c4d5b2c"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08ab7b",
-                    "hash" : "0x38373c1cd2e9e47412d4c1124fbc2f7e8ef8aac8d706bd1034f011373eeefc1b",
-                    "mixHash" : "0x23e81dc8c33e706566e5e52ad489e99cac6758a9097cc3c77bcd9876a21c95f8",
-                    "nonce" : "0xbe32f774f129e167",
-                    "number" : "0x01",
-                    "parentHash" : "0x7cef7660ca7b844c05919e3a2f6e18e219cbdb8e8ff704e8215c93e40704f504",
-                    "receiptTrie" : "0xf4c7252d39dc71c1bda99a4184b223c05cb76801d7b7e3e524fa6d7a4a1c7256",
-                    "stateRoot" : "0x05fb9ecfee87e1c5dad24b6c663dbc5066473cdbc49fcec76c06c8aef5dc2a66",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f9a07cef7660ca7b844c05919e3a2f6e18e219cbdb8e8ff704e8215c93e40704f504a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa005fb9ecfee87e1c5dad24b6c663dbc5066473cdbc49fcec76c06c8aef5dc2a66a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0f4c7252d39dc71c1bda99a4184b223c05cb76801d7b7e3e524fa6d7a4a1c7256b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7b8203e880a023e81dc8c33e706566e5e52ad489e99cac6758a9097cc3c77bcd9876a21c95f888be32f774f129e167f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x01c9c380",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
-                        "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0xb2d05e00",
-            "gasUsed" : "0x00",
-            "hash" : "0x7cef7660ca7b844c05919e3a2f6e18e219cbdb8e8ff704e8215c93e40704f504",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb796e810c641ec7c5d9c7db3f419843068a401dd525ef70c9f177e5e1ce58399",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b796e810c641ec7c5d9c7db3f419843068a401dd525ef70c9f177e5e1ce58399a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x38373c1cd2e9e47412d4c1124fbc2f7e8ef8aac8d706bd1034f011373eeefc1b",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000016207a120f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fcab7b",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5485",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000016207a120f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcallcallcode_ABCB_RECURSIVE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "60948db9691280d2ec800157e58d50d2654fe1e02c01a2f0426c56a64c4d5b2c"
+            "sourceHash" : "9dc82826751c1d733151b86172352bdc35baa537aa7a2f7f8109cc26e0218ba0"
         },
         "blocks" : [
             {
@@ -427,9 +153,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x0ff67c",
-                    "hash" : "0x0391c36921a3d44eef5fc95528c28c8279c7fb1a1f36f2f43899080a0927f99b",
-                    "mixHash" : "0x960236bdd363af601bff22e3cad8c807e546ba4ff0af65fcbbb5e0e37c34e1a5",
-                    "nonce" : "0x23265e41f247722d",
+                    "hash" : "0xecd4cf96adabeed38435de15ada47d0cd0ba97e9c4e3a9b6d4a2489cc0ddf6a6",
+                    "mixHash" : "0x88b85bada534c841b3904b86748c65b1ebc2eb38e00cc12011acc2c7c1fcd3d7",
+                    "nonce" : "0xdba6ae520e520a89",
                     "number" : "0x01",
                     "parentHash" : "0x7cef7660ca7b844c05919e3a2f6e18e219cbdb8e8ff704e8215c93e40704f504",
                     "receiptTrie" : "0x2fea2d054f9df57e4c8863bc7f2378919d05fd483bf7bc452cc3333ed3d025e2",
@@ -438,10 +164,10 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a07cef7660ca7b844c05919e3a2f6e18e219cbdb8e8ff704e8215c93e40704f504a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec8ab45b598101f7e694bca3f03afe7242905e21da01c820425e6d9d16ea4ebea06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a02fea2d054f9df57e4c8863bc7f2378919d05fd483bf7bc452cc3333ed3d025e2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e00830ff67c8203e880a0960236bdd363af601bff22e3cad8c807e546ba4ff0af65fcbbb5e0e37c34e1a58823265e41f247722df863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a07cef7660ca7b844c05919e3a2f6e18e219cbdb8e8ff704e8215c93e40704f504a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec8ab45b598101f7e694bca3f03afe7242905e21da01c820425e6d9d16ea4ebea06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a02fea2d054f9df57e4c8863bc7f2378919d05fd483bf7bc452cc3333ed3d025e2b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e00830ff67c8203e880a088b85bada534c841b3904b86748c65b1ebc2eb38e00cc12011acc2c7c1fcd3d788dba6ae520e520a89f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -475,7 +201,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b796e810c641ec7c5d9c7db3f419843068a401dd525ef70c9f177e5e1ce58399a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0391c36921a3d44eef5fc95528c28c8279c7fb1a1f36f2f43899080a0927f99b",
+        "lastblockhash" : "0xecd4cf96adabeed38435de15ada47d0cd0ba97e9c4e3a9b6d4a2489cc0ddf6a6",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -549,10 +275,10 @@
     "callcallcallcode_ABCB_RECURSIVE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "60948db9691280d2ec800157e58d50d2654fe1e02c01a2f0426c56a64c4d5b2c"
+            "sourceHash" : "9dc82826751c1d733151b86172352bdc35baa537aa7a2f7f8109cc26e0218ba0"
         },
         "blocks" : [
             {
@@ -563,9 +289,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3bf",
-                    "hash" : "0x583ba92bb8a88bb5d708aad5dd25c47534f8aa443a7dc8a8963c00e257509a25",
-                    "mixHash" : "0xebc6ae1ebe9b7db28c787e70378b7c46040c8e38f04f9a7e10f95ba49b3350e0",
-                    "nonce" : "0x9b46841b1275d001",
+                    "hash" : "0x10d5b5af904889d8e66d105fcc301fad82aec801719795feae2292c9701ec7d6",
+                    "mixHash" : "0xd6dbefee9fbb9bd2068c53a480fed7ad4833ae96143cb1be9755f990314370ca",
+                    "nonce" : "0xf981c2ae9f7fc4f2",
                     "number" : "0x01",
                     "parentHash" : "0x7cef7660ca7b844c05919e3a2f6e18e219cbdb8e8ff704e8215c93e40704f504",
                     "receiptTrie" : "0x1d0852c893ad95933eee44e6f8653ce6e7f524c36e419378d3cbfffaf874d354",
@@ -574,10 +300,10 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a07cef7660ca7b844c05919e3a2f6e18e219cbdb8e8ff704e8215c93e40704f504a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a3369092b80da2652d7aa89a0794a9a78f036729722848d8f4e43abb442db7ca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a01d0852c893ad95933eee44e6f8653ce6e7f524c36e419378d3cbfffaf874d354b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3bf8203e880a0ebc6ae1ebe9b7db28c787e70378b7c46040c8e38f04f9a7e10f95ba49b3350e0889b46841b1275d001f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a07cef7660ca7b844c05919e3a2f6e18e219cbdb8e8ff704e8215c93e40704f504a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05a3369092b80da2652d7aa89a0794a9a78f036729722848d8f4e43abb442db7ca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a01d0852c893ad95933eee44e6f8653ce6e7f524c36e419378d3cbfffaf874d354b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3bf8203e880a0d6dbefee9fbb9bd2068c53a480fed7ad4833ae96143cb1be9755f990314370ca88f981c2ae9f7fc4f2f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -611,7 +337,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b796e810c641ec7c5d9c7db3f419843068a401dd525ef70c9f177e5e1ce58399a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x583ba92bb8a88bb5d708aad5dd25c47534f8aa443a7dc8a8963c00e257509a25",
+        "lastblockhash" : "0x10d5b5af904889d8e66d105fcc301fad82aec801719795feae2292c9701ec7d6",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGE_d0g0v0.json
index bf4bf0483..07fddf34f 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGE_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcode_01_OOGE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "ad7a9709f8a2fc8ef14fba201dcecae5df270f2b62d285b4878306b8c1c337ae"
+            "sourceHash" : "e58efe1de5ab66bde11db7190ca4b030895563d6e92fa4e2de6e2b8d74e60232"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010795",
-                    "hash" : "0x7db649f827a3d3aec767cbd59bc520a9356d993727c50220458ff15afaa26ee3",
-                    "mixHash" : "0x6e1e009b98f686b8e4f4d357852cdd3ca964eaaf66d59a6912d8c45de4a3f3ea",
-                    "nonce" : "0xafd6b03e6e4a221a",
+                    "hash" : "0xfb2d26b216ceb64eb79a963fac82547c78803d1a0c53a7de9aea37c4b9ffa403",
+                    "mixHash" : "0x52fd0e5429b5ce3f734f1d8074825e3ab8ee32368a03d25a0458ee3fd2d33120",
+                    "nonce" : "0x80f6aa52fd00f6f8",
                     "number" : "0x01",
                     "parentHash" : "0x8673a9a9fe777b303443065c492a4101f0226db713076a1039a04ee8e28db1aa",
                     "receiptTrie" : "0x24ec4468a705b1167cebec8e06ed5023585b5132b6a8a519ce17973cf79b20c8",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a08673a9a9fe777b303443065c492a4101f0226db713076a1039a04ee8e28db1aaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf721c3c273dd0bc299648040be6638a64e740b2a073411c740f49948f9c1620a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea024ec4468a705b1167cebec8e06ed5023585b5132b6a8a519ce17973cf79b20c8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107958203e880a06e1e009b98f686b8e4f4d357852cdd3ca964eaaf66d59a6912d8c45de4a3f3ea88afd6b03e6e4a221af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a08673a9a9fe777b303443065c492a4101f0226db713076a1039a04ee8e28db1aaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bf721c3c273dd0bc299648040be6638a64e740b2a073411c740f49948f9c1620a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea024ec4468a705b1167cebec8e06ed5023585b5132b6a8a519ce17973cf79b20c8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107958203e880a052fd0e5429b5ce3f734f1d8074825e3ab8ee32368a03d25a0458ee3fd2d331208880f6aa52fd00f6f8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c72d4b6d6f6742522acca32f179cb4bb9de6774d5c43c497266d7c2af8a6e6b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7db649f827a3d3aec767cbd59bc520a9356d993727c50220458ff15afaa26ee3",
+        "lastblockhash" : "0xfb2d26b216ceb64eb79a963fac82547c78803d1a0c53a7de9aea37c4b9ffa403",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -135,285 +135,13 @@
             }
         }
     },
-    "callcallcode_01_OOGE_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "ad7a9709f8a2fc8ef14fba201dcecae5df270f2b62d285b4878306b8c1c337ae"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x010795",
-                    "hash" : "0x7395e2f90af5ca744297c72d394f8b12807ee298a84dfb188fd6d875d50a2cbd",
-                    "mixHash" : "0x1a3af34254be307a2c247fae90495de5e9543caf19c3016bc9cd62533adbba4a",
-                    "nonce" : "0xda6dd72e1b0745de",
-                    "number" : "0x01",
-                    "parentHash" : "0x8673a9a9fe777b303443065c492a4101f0226db713076a1039a04ee8e28db1aa",
-                    "receiptTrie" : "0xe9c6042f52b28dc0f6b3133e7f4f8d7ef795b80eb14780e352cba4270fb29e1c",
-                    "stateRoot" : "0xbfefe3a9937f7637a4d4e9e35ef1cd83a5a0577581d2b7331da2aeeaf077a7c6",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a08673a9a9fe777b303443065c492a4101f0226db713076a1039a04ee8e28db1aaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bfefe3a9937f7637a4d4e9e35ef1cd83a5a0577581d2b7331da2aeeaf077a7c6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e9c6042f52b28dc0f6b3133e7f4f8d7ef795b80eb14780e352cba4270fb29e1cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107958203e880a01a3af34254be307a2c247fae90495de5e9543caf19c3016bc9cd62533adbba4a88da6dd72e1b0745def862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x8673a9a9fe777b303443065c492a4101f0226db713076a1039a04ee8e28db1aa",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xc72d4b6d6f6742522acca32f179cb4bb9de6774d5c43c497266d7c2af8a6e6b1",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c72d4b6d6f6742522acca32f179cb4bb9de6774d5c43c497266d7c2af8a6e6b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7395e2f90af5ca744297c72d394f8b12807ee298a84dfb188fd6d875d50a2cbd",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaa8f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002614e34f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50795",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762f86b",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaa8f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002614e34f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcallcode_01_OOGE_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/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "ad7a9709f8a2fc8ef14fba201dcecae5df270f2b62d285b4878306b8c1c337ae"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x010795",
-                    "hash" : "0x1c61f111550b747afc3e4f03ce371610ed52181bf5a1f8acfd4fe5b5ebcd1a91",
-                    "mixHash" : "0x08040b2871a7055fc71f5e7cc6177fadcc08be5c5511c2ab1d4e2b27ae833eb8",
-                    "nonce" : "0x683d4d142fbc7e35",
-                    "number" : "0x01",
-                    "parentHash" : "0x8673a9a9fe777b303443065c492a4101f0226db713076a1039a04ee8e28db1aa",
-                    "receiptTrie" : "0xe9c6042f52b28dc0f6b3133e7f4f8d7ef795b80eb14780e352cba4270fb29e1c",
-                    "stateRoot" : "0xbfefe3a9937f7637a4d4e9e35ef1cd83a5a0577581d2b7331da2aeeaf077a7c6",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a08673a9a9fe777b303443065c492a4101f0226db713076a1039a04ee8e28db1aaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bfefe3a9937f7637a4d4e9e35ef1cd83a5a0577581d2b7331da2aeeaf077a7c6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e9c6042f52b28dc0f6b3133e7f4f8d7ef795b80eb14780e352cba4270fb29e1cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107958203e880a008040b2871a7055fc71f5e7cc6177fadcc08be5c5511c2ab1d4e2b27ae833eb888683d4d142fbc7e35f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x8673a9a9fe777b303443065c492a4101f0226db713076a1039a04ee8e28db1aa",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xc72d4b6d6f6742522acca32f179cb4bb9de6774d5c43c497266d7c2af8a6e6b1",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c72d4b6d6f6742522acca32f179cb4bb9de6774d5c43c497266d7c2af8a6e6b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1c61f111550b747afc3e4f03ce371610ed52181bf5a1f8acfd4fe5b5ebcd1a91",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaa8f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002614e34f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50795",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762f86b",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaa8f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002614e34f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcallcode_01_OOGE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "ad7a9709f8a2fc8ef14fba201dcecae5df270f2b62d285b4878306b8c1c337ae"
+            "sourceHash" : "e58efe1de5ab66bde11db7190ca4b030895563d6e92fa4e2de6e2b8d74e60232"
         },
         "blocks" : [
             {
@@ -424,9 +152,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x01507e",
-                    "hash" : "0x6797934c670303c16cb3cb1f91285c5e7284f262d46fefbb63325d4f3468a9fc",
-                    "mixHash" : "0x0b4aff5634ab5ce5f369d79c78a6cae7a076c898aeccaff60bd7f400236d0333",
-                    "nonce" : "0x9a9d1f9aa0981595",
+                    "hash" : "0xb15d059527f32bd994522fb5183a7d08a4cd3e4bf02540e878b5d0533ca837c7",
+                    "mixHash" : "0x3f3b9d51edde9ce116871f71b9541b8a16ba368bb044d26b4739f987c7a3ea66",
+                    "nonce" : "0x202cdfcc29691c03",
                     "number" : "0x01",
                     "parentHash" : "0x8673a9a9fe777b303443065c492a4101f0226db713076a1039a04ee8e28db1aa",
                     "receiptTrie" : "0x4ec790591181d99660bd6097d2fcd5643f88d9939e5f484084aef6b0fde69717",
@@ -435,10 +163,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a08673a9a9fe777b303443065c492a4101f0226db713076a1039a04ee8e28db1aaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035d9022b251e5b38ecb48f26ed54c9f4e4ad842a88150d2b43c0d50280af1220a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04ec790591181d99660bd6097d2fcd5643f88d9939e5f484084aef6b0fde69717b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301507e8203e880a00b4aff5634ab5ce5f369d79c78a6cae7a076c898aeccaff60bd7f400236d0333889a9d1f9aa0981595f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a08673a9a9fe777b303443065c492a4101f0226db713076a1039a04ee8e28db1aaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035d9022b251e5b38ecb48f26ed54c9f4e4ad842a88150d2b43c0d50280af1220a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04ec790591181d99660bd6097d2fcd5643f88d9939e5f484084aef6b0fde69717b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301507e8203e880a03f3b9d51edde9ce116871f71b9541b8a16ba368bb044d26b4739f987c7a3ea6688202cdfcc29691c03f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -472,7 +200,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c72d4b6d6f6742522acca32f179cb4bb9de6774d5c43c497266d7c2af8a6e6b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6797934c670303c16cb3cb1f91285c5e7284f262d46fefbb63325d4f3468a9fc",
+        "lastblockhash" : "0xb15d059527f32bd994522fb5183a7d08a4cd3e4bf02540e878b5d0533ca837c7",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -541,141 +269,5 @@
                 }
             }
         }
-    },
-    "callcallcode_01_OOGE_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/stCallDelegateCodesCallCodeHomestead/callcallcode_01_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "ad7a9709f8a2fc8ef14fba201dcecae5df270f2b62d285b4878306b8c1c337ae"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x01026d",
-                    "hash" : "0x575e2921faa41da7503a335836ae59c2055b0067f6a71626a67e588686777410",
-                    "mixHash" : "0xe78fd54e283988a15fb7168debf1eb84ca10ba05822610697c7f5f77c78fcf26",
-                    "nonce" : "0xfcd3a84c271944a2",
-                    "number" : "0x01",
-                    "parentHash" : "0x8673a9a9fe777b303443065c492a4101f0226db713076a1039a04ee8e28db1aa",
-                    "receiptTrie" : "0xa3fe624a759921cf9342bf96d1209c1a6607fdd7723fd099d32224486bf0da65",
-                    "stateRoot" : "0x830a510c79317df6844da6d31166af630dab99e29183a21261124a4feef97dfc",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a08673a9a9fe777b303443065c492a4101f0226db713076a1039a04ee8e28db1aaa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0830a510c79317df6844da6d31166af630dab99e29183a21261124a4feef97dfca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a3fe624a759921cf9342bf96d1209c1a6607fdd7723fd099d32224486bf0da65b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301026d8203e880a0e78fd54e283988a15fb7168debf1eb84ca10ba05822610697c7f5f77c78fcf2688fcd3a84c271944a2f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x8673a9a9fe777b303443065c492a4101f0226db713076a1039a04ee8e28db1aa",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xc72d4b6d6f6742522acca32f179cb4bb9de6774d5c43c497266d7c2af8a6e6b1",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c72d4b6d6f6742522acca32f179cb4bb9de6774d5c43c497266d7c2af8a6e6b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x575e2921faa41da7503a335836ae59c2055b0067f6a71626a67e588686777410",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaa8f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002614e34f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5026d",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762fd93",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaa8f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002614e34f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEnd_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEnd_d0g0v0.json
index 9a1d4cbd9..cd8419795 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEnd_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEnd_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcode_01_SuicideEnd_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "050ed0e3c86c409c2e66f35836a864a839e7ad5f26f83e7d16b21bc8d4c18fe8"
+            "sourceHash" : "ec0b6dbb63f363907bb8e219655d3bdfd4ea9b9958459d25042ffe3dde4097d8"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf7ea",
-                    "hash" : "0x21fbc0018e2788c3a27f33c96da9d687b2c75123a88a92d88b715f011e510d83",
-                    "mixHash" : "0xe5537160e5496eccf82467f96862cd23bb4822156e5fe6392a3af9a8b5457643",
-                    "nonce" : "0xee3a8a9e60f5d939",
+                    "hash" : "0x3ae0625f02c7e844975e9c5c2c302e993ee725f0901307ba400836ff72c6ebe3",
+                    "mixHash" : "0xf7d94daf624d0a9bda17d560f575ebe663353312a5824dd2c12c94df7488a492",
+                    "nonce" : "0x100b6a21eb2a5ac4",
                     "number" : "0x01",
                     "parentHash" : "0x49915cb41efa44758573d123898174fc1ed2eb2a2cff09b7f3f65e33db69940d",
                     "receiptTrie" : "0x4e3cb88bd856b620a4b8bec6a168e222cc9fb69dfe0cedbc567dc2e82e7d991e",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a049915cb41efa44758573d123898174fc1ed2eb2a2cff09b7f3f65e33db69940da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c643baa622540f4b0dff437de5ea38d9e7a8e5e4e2ba4e37fbdaa4dcdc6a03d3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a04e3cb88bd856b620a4b8bec6a168e222cc9fb69dfe0cedbc567dc2e82e7d991eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ea8203e880a0e5537160e5496eccf82467f96862cd23bb4822156e5fe6392a3af9a8b545764388ee3a8a9e60f5d939f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a049915cb41efa44758573d123898174fc1ed2eb2a2cff09b7f3f65e33db69940da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c643baa622540f4b0dff437de5ea38d9e7a8e5e4e2ba4e37fbdaa4dcdc6a03d3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a04e3cb88bd856b620a4b8bec6a168e222cc9fb69dfe0cedbc567dc2e82e7d991eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ea8203e880a0f7d94daf624d0a9bda17d560f575ebe663353312a5824dd2c12c94df7488a49288100b6a21eb2a5ac4f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02fd2aaa899494a4ec18c2ead1de1bcdbf1bdaa2d212f9c5ae67e138aad894112a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x21fbc0018e2788c3a27f33c96da9d687b2c75123a88a92d88b715f011e510d83",
+        "lastblockhash" : "0x3ae0625f02c7e844975e9c5c2c302e993ee725f0901307ba400836ff72c6ebe3",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -127,269 +127,13 @@
             }
         }
     },
-    "callcallcode_01_SuicideEnd_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "050ed0e3c86c409c2e66f35836a864a839e7ad5f26f83e7d16b21bc8d4c18fe8"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf7ea",
-                    "hash" : "0x44aee6c9f9ad370f4785715de74bf023ae9dfeb2572815bb82fd08e68a0acbe2",
-                    "mixHash" : "0x1d80fcd12690417f025804038bef0724c87b2558667ebd72e41329151db85f4c",
-                    "nonce" : "0x98e2c0f7a9c4cd7a",
-                    "number" : "0x01",
-                    "parentHash" : "0x49915cb41efa44758573d123898174fc1ed2eb2a2cff09b7f3f65e33db69940d",
-                    "receiptTrie" : "0x4d35ae7c509746cce2bc3120029989b901d06eaf529a157567592d48299885bb",
-                    "stateRoot" : "0x3737119f6a2d99847ddcdae77181c71138c080ec33544d62008b3a435587474f",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a049915cb41efa44758573d123898174fc1ed2eb2a2cff09b7f3f65e33db69940da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03737119f6a2d99847ddcdae77181c71138c080ec33544d62008b3a435587474fa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a04d35ae7c509746cce2bc3120029989b901d06eaf529a157567592d48299885bbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ea8203e880a01d80fcd12690417f025804038bef0724c87b2558667ebd72e41329151db85f4c8898e2c0f7a9c4cd7af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x49915cb41efa44758573d123898174fc1ed2eb2a2cff09b7f3f65e33db69940d",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x2fd2aaa899494a4ec18c2ead1de1bcdbf1bdaa2d212f9c5ae67e138aad894112",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02fd2aaa899494a4ec18c2ead1de1bcdbf1bdaa2d212f9c5ae67e138aad894112a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x44aee6c9f9ad370f4785715de74bf023ae9dfeb2572815bb82fd08e68a0acbe2",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000261c350f4600155731000000000000000000000000000000000000000ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f7ea",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7630816",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000261c350f4600155731000000000000000000000000000000000000000ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcallcode_01_SuicideEnd_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/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "050ed0e3c86c409c2e66f35836a864a839e7ad5f26f83e7d16b21bc8d4c18fe8"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf7ea",
-                    "hash" : "0x6dc485fe9580f8b643ac77248db497209597388ba359fb59e9878c58c7bcf361",
-                    "mixHash" : "0xeff25802769c293f1b912dfe4759e6eb102e8b202e47ce930c25e794ad8cf6c9",
-                    "nonce" : "0x5f6964f4baf23678",
-                    "number" : "0x01",
-                    "parentHash" : "0x49915cb41efa44758573d123898174fc1ed2eb2a2cff09b7f3f65e33db69940d",
-                    "receiptTrie" : "0x4d35ae7c509746cce2bc3120029989b901d06eaf529a157567592d48299885bb",
-                    "stateRoot" : "0x3737119f6a2d99847ddcdae77181c71138c080ec33544d62008b3a435587474f",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a049915cb41efa44758573d123898174fc1ed2eb2a2cff09b7f3f65e33db69940da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03737119f6a2d99847ddcdae77181c71138c080ec33544d62008b3a435587474fa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a04d35ae7c509746cce2bc3120029989b901d06eaf529a157567592d48299885bbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ea8203e880a0eff25802769c293f1b912dfe4759e6eb102e8b202e47ce930c25e794ad8cf6c9885f6964f4baf23678f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x49915cb41efa44758573d123898174fc1ed2eb2a2cff09b7f3f65e33db69940d",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x2fd2aaa899494a4ec18c2ead1de1bcdbf1bdaa2d212f9c5ae67e138aad894112",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02fd2aaa899494a4ec18c2ead1de1bcdbf1bdaa2d212f9c5ae67e138aad894112a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6dc485fe9580f8b643ac77248db497209597388ba359fb59e9878c58c7bcf361",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000261c350f4600155731000000000000000000000000000000000000000ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f7ea",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7630816",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000261c350f4600155731000000000000000000000000000000000000000ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcallcode_01_SuicideEnd_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "050ed0e3c86c409c2e66f35836a864a839e7ad5f26f83e7d16b21bc8d4c18fe8"
+            "sourceHash" : "ec0b6dbb63f363907bb8e219655d3bdfd4ea9b9958459d25042ffe3dde4097d8"
         },
         "blocks" : [
             {
@@ -400,9 +144,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x02afc6",
-                    "hash" : "0xccf0e95664969ef207899541626a30748fb8bdec2744cda2915d001737e2a523",
-                    "mixHash" : "0x5127a01b88cb84c82fe8023859ca57e67fdea8d2e4ffff8aad9d26f1b951d66b",
-                    "nonce" : "0xb6204dbf8b164e15",
+                    "hash" : "0xfedc7718071d48d4bfae2ca27881d73f155ceb889a01ad47f13a7dcc5098f1ad",
+                    "mixHash" : "0x834e00805e411edf6e518ff17d0da1be17bf602573fdbd4f64f8c37210ee68f7",
+                    "nonce" : "0x5fa46e7a69f55e24",
                     "number" : "0x01",
                     "parentHash" : "0x49915cb41efa44758573d123898174fc1ed2eb2a2cff09b7f3f65e33db69940d",
                     "receiptTrie" : "0x508670e28a51a43e9513eee7bfa61f53ee6f101073062cc107c0a6ffa819a415",
@@ -411,10 +155,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a049915cb41efa44758573d123898174fc1ed2eb2a2cff09b7f3f65e33db69940da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341e6df68ca9afbb847e6e2634209deb808d19d286b74454ed35ef1ff8ebccf9a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0508670e28a51a43e9513eee7bfa61f53ee6f101073062cc107c0a6ffa819a415b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808302afc68203e880a05127a01b88cb84c82fe8023859ca57e67fdea8d2e4ffff8aad9d26f1b951d66b88b6204dbf8b164e15f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a049915cb41efa44758573d123898174fc1ed2eb2a2cff09b7f3f65e33db69940da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0341e6df68ca9afbb847e6e2634209deb808d19d286b74454ed35ef1ff8ebccf9a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0508670e28a51a43e9513eee7bfa61f53ee6f101073062cc107c0a6ffa819a415b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808302afc68203e880a0834e00805e411edf6e518ff17d0da1be17bf602573fdbd4f64f8c37210ee68f7885fa46e7a69f55e24f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -448,7 +192,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02fd2aaa899494a4ec18c2ead1de1bcdbf1bdaa2d212f9c5ae67e138aad894112a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xccf0e95664969ef207899541626a30748fb8bdec2744cda2915d001737e2a523",
+        "lastblockhash" : "0xfedc7718071d48d4bfae2ca27881d73f155ceb889a01ad47f13a7dcc5098f1ad",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -517,133 +261,5 @@
                 }
             }
         }
-    },
-    "callcallcode_01_SuicideEnd_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/stCallDelegateCodesCallCodeHomestead/callcallcode_01_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "050ed0e3c86c409c2e66f35836a864a839e7ad5f26f83e7d16b21bc8d4c18fe8"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xdf3a",
-                    "hash" : "0x7b77187bab45df0cbcbf66552abffc6a5322df07dc28577747a1fd814c238466",
-                    "mixHash" : "0xb5f680186cdfafb489d9cc6b442ef882f9a09c5acf643d695ac8d5f1bd7c9b29",
-                    "nonce" : "0x3ad0c6968e0bf481",
-                    "number" : "0x01",
-                    "parentHash" : "0x49915cb41efa44758573d123898174fc1ed2eb2a2cff09b7f3f65e33db69940d",
-                    "receiptTrie" : "0x87a04bf63adb79f3539aa18909fb3352fa655614c69135045890677925aa54a4",
-                    "stateRoot" : "0xe7a60b75f88cd0c9a7660067e2a066ce443a8d59090ee3582b880004da31c044",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a049915cb41efa44758573d123898174fc1ed2eb2a2cff09b7f3f65e33db69940da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7a60b75f88cd0c9a7660067e2a066ce443a8d59090ee3582b880004da31c044a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a087a04bf63adb79f3539aa18909fb3352fa655614c69135045890677925aa54a4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3a8203e880a0b5f680186cdfafb489d9cc6b442ef882f9a09c5acf643d695ac8d5f1bd7c9b29883ad0c6968e0bf481f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x49915cb41efa44758573d123898174fc1ed2eb2a2cff09b7f3f65e33db69940d",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x2fd2aaa899494a4ec18c2ead1de1bcdbf1bdaa2d212f9c5ae67e138aad894112",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02fd2aaa899494a4ec18c2ead1de1bcdbf1bdaa2d212f9c5ae67e138aad894112a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7b77187bab45df0cbcbf66552abffc6a5322df07dc28577747a1fd814c238466",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000261c350f4600155731000000000000000000000000000000000000000ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4df3a",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76320c6",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000261c350f4600155731000000000000000000000000000000000000000ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_d0g0v0.json
index e6b0b62c5..edc9d1314 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcode_01_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_d0g0v0Filler.json",
-            "sourceHash" : "7b1870990899beefd2a0364dab42f6f54933d9cdff584c983c6c50d9e83dd039"
+            "sourceHash" : "e5e3b9342fe42f3653f89cd206c9d8246a512362e88f4400e4c8283eda89e454"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x037f4e",
-                    "hash" : "0x3259c837e46101617b4ca95316d93b311a2684b223669792805d06be88b64c8c",
-                    "mixHash" : "0xd340ff0c3df11dd82b681b69ac02c8f4626aac1707a67dda96f4847135ec1144",
-                    "nonce" : "0x4d91159048e63f35",
+                    "hash" : "0x814d394a79f68f628a0a865baab0d3aa06afbb82f686d00f888d7dd088dfa7e5",
+                    "mixHash" : "0xc41a722241ef2dfb7e362a7355b4b7be5232aa9781fe16dc4218cfe59e8b104a",
+                    "nonce" : "0xe070b38fea0792cd",
                     "number" : "0x01",
                     "parentHash" : "0x6e3f97e37325ec838ecfbd1d9479cf48891f8c0291a6f734e3c823ace3df6972",
                     "receiptTrie" : "0xb2b164f9345de5f7d05d32391c8f56a1dd4f57b4e93aef2849a559b23685f748",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06e3f97e37325ec838ecfbd1d9479cf48891f8c0291a6f734e3c823ace3df6972a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048b1d7f12c5923be6a748928a0086674291ae3031fe42d52b9773a4b8d4e9a40a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0b2b164f9345de5f7d05d32391c8f56a1dd4f57b4e93aef2849a559b23685f748b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083037f4e8203e880a0d340ff0c3df11dd82b681b69ac02c8f4626aac1707a67dda96f4847135ec1144884d91159048e63f35f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06e3f97e37325ec838ecfbd1d9479cf48891f8c0291a6f734e3c823ace3df6972a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048b1d7f12c5923be6a748928a0086674291ae3031fe42d52b9773a4b8d4e9a40a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0b2b164f9345de5f7d05d32391c8f56a1dd4f57b4e93aef2849a559b23685f748b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083037f4e8203e880a0c41a722241ef2dfb7e362a7355b4b7be5232aa9781fe16dc4218cfe59e8b104a88e070b38fea0792cdf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086fdbd1979270913e4a1a074d73a456722791288a10b651abca212f0e493e668a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3259c837e46101617b4ca95316d93b311a2684b223669792805d06be88b64c8c",
+        "lastblockhash" : "0x814d394a79f68f628a0a865baab0d3aa06afbb82f686d00f888d7dd088dfa7e5",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -144,303 +144,13 @@
             }
         }
     },
-    "callcallcode_01_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_d0g0v0Filler.json",
-            "sourceHash" : "7b1870990899beefd2a0364dab42f6f54933d9cdff584c983c6c50d9e83dd039"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x037f4e",
-                    "hash" : "0x7f67e1749510d34e2f5fcad4bff17481a925ed2a827ec4e90fdb8d63dd839b38",
-                    "mixHash" : "0xa432e671911c1a351f4323fa523000ebf97a7e591dda81aac3d95268c118e9aa",
-                    "nonce" : "0x74951f085c872b45",
-                    "number" : "0x01",
-                    "parentHash" : "0x6e3f97e37325ec838ecfbd1d9479cf48891f8c0291a6f734e3c823ace3df6972",
-                    "receiptTrie" : "0x7986d65fb0cf02741f7e4d6562b2d5d13004f0655b8221b70d63f216383a3d84",
-                    "stateRoot" : "0x3e10d7c344f16006da7211c9141a2d9a5975ea3a34527e457fd5287607e6a122",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a06e3f97e37325ec838ecfbd1d9479cf48891f8c0291a6f734e3c823ace3df6972a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e10d7c344f16006da7211c9141a2d9a5975ea3a34527e457fd5287607e6a122a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a07986d65fb0cf02741f7e4d6562b2d5d13004f0655b8221b70d63f216383a3d84b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083037f4e8203e880a0a432e671911c1a351f4323fa523000ebf97a7e591dda81aac3d95268c118e9aa8874951f085c872b45f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x6e3f97e37325ec838ecfbd1d9479cf48891f8c0291a6f734e3c823ace3df6972",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x86fdbd1979270913e4a1a074d73a456722791288a10b651abca212f0e493e668",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086fdbd1979270913e4a1a074d73a456722791288a10b651abca212f0e493e668a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7f67e1749510d34e2f5fcad4bff17481a925ed2a827ec4e90fdb8d63dd839b38",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x02" : "0x01",
-                    "0x04" : "0x1000000000000000000000000000000000000000",
-                    "0x05" : "0x01",
-                    "0xe6" : "0x1000000000000000000000000000000000000000",
-                    "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0xec" : "0x40",
-                    "0xee" : "0x21",
-                    "0xf0" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000026203d090f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160025533600455346005553060e6553260e8553660ec553860ee553a60f055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f77f4e",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76080b2",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000026203d090f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160025533600455346005553060e6553260e8553660ec553860ee553a60f055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcallcode_01_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/stCallDelegateCodesCallCodeHomestead/callcallcode_01_d0g0v0Filler.json",
-            "sourceHash" : "7b1870990899beefd2a0364dab42f6f54933d9cdff584c983c6c50d9e83dd039"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x037f4e",
-                    "hash" : "0xe69a59e840fea3ef0a1283e0b95f5f196e730b457a205f2cf9fc60f6ae6484f8",
-                    "mixHash" : "0x909cfd8697e0503cfcc987ff71b6ec80fbbc96dcecc141ec4d1eec94571a8465",
-                    "nonce" : "0x6713d39efc7fb98a",
-                    "number" : "0x01",
-                    "parentHash" : "0x6e3f97e37325ec838ecfbd1d9479cf48891f8c0291a6f734e3c823ace3df6972",
-                    "receiptTrie" : "0x7986d65fb0cf02741f7e4d6562b2d5d13004f0655b8221b70d63f216383a3d84",
-                    "stateRoot" : "0x3e10d7c344f16006da7211c9141a2d9a5975ea3a34527e457fd5287607e6a122",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a06e3f97e37325ec838ecfbd1d9479cf48891f8c0291a6f734e3c823ace3df6972a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e10d7c344f16006da7211c9141a2d9a5975ea3a34527e457fd5287607e6a122a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a07986d65fb0cf02741f7e4d6562b2d5d13004f0655b8221b70d63f216383a3d84b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083037f4e8203e880a0909cfd8697e0503cfcc987ff71b6ec80fbbc96dcecc141ec4d1eec94571a8465886713d39efc7fb98af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x6e3f97e37325ec838ecfbd1d9479cf48891f8c0291a6f734e3c823ace3df6972",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x86fdbd1979270913e4a1a074d73a456722791288a10b651abca212f0e493e668",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086fdbd1979270913e4a1a074d73a456722791288a10b651abca212f0e493e668a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe69a59e840fea3ef0a1283e0b95f5f196e730b457a205f2cf9fc60f6ae6484f8",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x02" : "0x01",
-                    "0x04" : "0x1000000000000000000000000000000000000000",
-                    "0x05" : "0x01",
-                    "0xe6" : "0x1000000000000000000000000000000000000000",
-                    "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0xec" : "0x40",
-                    "0xee" : "0x21",
-                    "0xf0" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000026203d090f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160025533600455346005553060e6553260e8553660ec553860ee553a60f055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f77f4e",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76080b2",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000026203d090f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160025533600455346005553060e6553260e8553660ec553860ee553a60f055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcallcode_01_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcode_01_d0g0v0Filler.json",
-            "sourceHash" : "7b1870990899beefd2a0364dab42f6f54933d9cdff584c983c6c50d9e83dd039"
+            "sourceHash" : "e5e3b9342fe42f3653f89cd206c9d8246a512362e88f4400e4c8283eda89e454"
         },
         "blocks" : [
             {
@@ -451,9 +161,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x05e02e",
-                    "hash" : "0x209a600e9a88f9990dd71240f833dbddecae88cd36d531793ed1c9f51905a7e4",
-                    "mixHash" : "0x198d70db0849a4bcecb3208bca0f2362ecf46f704590bca4a0c73e0a4a0cb5bd",
-                    "nonce" : "0x2138c5e2e44cbf22",
+                    "hash" : "0x89da6a7f62cef130a7b910e948310fa0155b754a28a187adb60efcf5c68b43bd",
+                    "mixHash" : "0xfa763b900895e86a0b008307a8c3d01d46094d135980d4124e38d829e8281be0",
+                    "nonce" : "0xb308b0f7fc277a45",
                     "number" : "0x01",
                     "parentHash" : "0x6e3f97e37325ec838ecfbd1d9479cf48891f8c0291a6f734e3c823ace3df6972",
                     "receiptTrie" : "0x7f0fd948689c7180b73a50bd7245705891d1ff21be1624f88109f93bb9d4ad51",
@@ -462,10 +172,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a06e3f97e37325ec838ecfbd1d9479cf48891f8c0291a6f734e3c823ace3df6972a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04073c07a243fa4f1f88c679313067d7c56e4caf79a4648b41a1ff7e08e98f167a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a07f0fd948689c7180b73a50bd7245705891d1ff21be1624f88109f93bb9d4ad51b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808305e02e8203e880a0198d70db0849a4bcecb3208bca0f2362ecf46f704590bca4a0c73e0a4a0cb5bd882138c5e2e44cbf22f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a06e3f97e37325ec838ecfbd1d9479cf48891f8c0291a6f734e3c823ace3df6972a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04073c07a243fa4f1f88c679313067d7c56e4caf79a4648b41a1ff7e08e98f167a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a07f0fd948689c7180b73a50bd7245705891d1ff21be1624f88109f93bb9d4ad51b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808305e02e8203e880a0fa763b900895e86a0b008307a8c3d01d46094d135980d4124e38d829e8281be088b308b0f7fc277a45f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -499,7 +209,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086fdbd1979270913e4a1a074d73a456722791288a10b651abca212f0e493e668a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x209a600e9a88f9990dd71240f833dbddecae88cd36d531793ed1c9f51905a7e4",
+        "lastblockhash" : "0x89da6a7f62cef130a7b910e948310fa0155b754a28a187adb60efcf5c68b43bd",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -568,150 +278,5 @@
                 }
             }
         }
-    },
-    "callcallcode_01_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/stCallDelegateCodesCallCodeHomestead/callcallcode_01_d0g0v0Filler.json",
-            "sourceHash" : "7b1870990899beefd2a0364dab42f6f54933d9cdff584c983c6c50d9e83dd039"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x037a26",
-                    "hash" : "0x5ec65338b86c4c42533d1e95f13a3cd7318111950709595a6a9dbc300fe43e28",
-                    "mixHash" : "0x0367e27fd7a8558ed8b0dccd9b7400c423d9138bd838e2981ada1650f8d24143",
-                    "nonce" : "0xa413a90a696d9a1e",
-                    "number" : "0x01",
-                    "parentHash" : "0x6e3f97e37325ec838ecfbd1d9479cf48891f8c0291a6f734e3c823ace3df6972",
-                    "receiptTrie" : "0xa30447e07930cad3f82eeeddae639fe67ab8c49e8e4b3188c5072fdce3559d55",
-                    "stateRoot" : "0x4468138a1ce28c36e2c625454d33c83598e9957f5c998646b42494b570f3b8b7",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a06e3f97e37325ec838ecfbd1d9479cf48891f8c0291a6f734e3c823ace3df6972a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04468138a1ce28c36e2c625454d33c83598e9957f5c998646b42494b570f3b8b7a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0a30447e07930cad3f82eeeddae639fe67ab8c49e8e4b3188c5072fdce3559d55b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083037a268203e880a00367e27fd7a8558ed8b0dccd9b7400c423d9138bd838e2981ada1650f8d2414388a413a90a696d9a1ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x6e3f97e37325ec838ecfbd1d9479cf48891f8c0291a6f734e3c823ace3df6972",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x86fdbd1979270913e4a1a074d73a456722791288a10b651abca212f0e493e668",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086fdbd1979270913e4a1a074d73a456722791288a10b651abca212f0e493e668a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5ec65338b86c4c42533d1e95f13a3cd7318111950709595a6a9dbc300fe43e28",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x02" : "0x01",
-                    "0x04" : "0x1000000000000000000000000000000000000000",
-                    "0x05" : "0x01",
-                    "0xe6" : "0x1000000000000000000000000000000000000000",
-                    "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0xec" : "0x40",
-                    "0xee" : "0x21",
-                    "0xf0" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000026203d090f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160025533600455346005553060e6553260e8553660ec553860ee553a60f055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f77a26",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76085da",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000026203d090f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160025533600455346005553060e6553260e8553660ec553860ee553a60f055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGE_d0g0v0.json
index 791e08f59..eba81d3ab 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGE_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_OOGE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "2dbbf989e2d00c74c20e5fe93bc5f7e7c87b267ce1761cc0b44b44d5c4cba697"
+            "sourceHash" : "c9ea8b3dd7a7e5cf39f99a150b99f5ace87de276cd5389c1cc918452bef71183"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x01588f",
-                    "hash" : "0x746d86dde3937d9f1bc871179d4d22df6752342df75f6722533b6f0cf7e4e8aa",
-                    "mixHash" : "0x4ac35c7aeb13fd6b2b39f6b5a23ce4de04704b3a9b48c100843d11832eb98e5c",
-                    "nonce" : "0x07cd20abac242c54",
+                    "hash" : "0x11e88a641d9857d06c27344f741952c6277510a44303d3ddcdf3012717308810",
+                    "mixHash" : "0x9f2813c8b2c01bfa929f61738f0960b850bedd8dfbf929ec3534a40f6ee2dbe0",
+                    "nonce" : "0x346b4220d494588d",
                     "number" : "0x01",
                     "parentHash" : "0x43ea4d2e8ccd7cc01075e138e254b4f26df5cc49e7b40a0fedcacd970e264c04",
                     "receiptTrie" : "0xf6d95b316df534ca539b32cd7d1efee460a09707e8daebacc70c1f459983a61a",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a043ea4d2e8ccd7cc01075e138e254b4f26df5cc49e7b40a0fedcacd970e264c04a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d60d0fd9b24b4c00f416675beade6c87fb490c3b0fdd95cf2c9341ac81d7702a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f6d95b316df534ca539b32cd7d1efee460a09707e8daebacc70c1f459983a61ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301588f8203e880a04ac35c7aeb13fd6b2b39f6b5a23ce4de04704b3a9b48c100843d11832eb98e5c8807cd20abac242c54f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a043ea4d2e8ccd7cc01075e138e254b4f26df5cc49e7b40a0fedcacd970e264c04a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08d60d0fd9b24b4c00f416675beade6c87fb490c3b0fdd95cf2c9341ac81d7702a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f6d95b316df534ca539b32cd7d1efee460a09707e8daebacc70c1f459983a61ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301588f8203e880a09f2813c8b2c01bfa929f61738f0960b850bedd8dfbf929ec3534a40f6ee2dbe088346b4220d494588df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb6e478d59be7c8381b9cafc24e3859ce3807813c4ca247241adfbb00fcebce2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x746d86dde3937d9f1bc871179d4d22df6752342df75f6722533b6f0cf7e4e8aa",
+        "lastblockhash" : "0x11e88a641d9857d06c27344f741952c6277510a44303d3ddcdf3012717308810",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -150,315 +150,13 @@
             }
         }
     },
-    "callcallcodecall_010_OOGE_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "2dbbf989e2d00c74c20e5fe93bc5f7e7c87b267ce1761cc0b44b44d5c4cba697"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x01588f",
-                    "hash" : "0x7cf8f7d6aa060fdab745ef904d67857be322597dd82549bfc880f7d1518b8b82",
-                    "mixHash" : "0xa95e54c77fe9f62407bbac071f73d018e2666e70941fc6c7832a06ebe8ab7f1a",
-                    "nonce" : "0xcf6c9da7b9ea0cda",
-                    "number" : "0x01",
-                    "parentHash" : "0x43ea4d2e8ccd7cc01075e138e254b4f26df5cc49e7b40a0fedcacd970e264c04",
-                    "receiptTrie" : "0xa3a1213b23b0c13887763a502ee9c3c9ba47d374a7b424d42bc15a21b1493369",
-                    "stateRoot" : "0x1a1d26d88f5ae3ce2ee984180f0b3e39a29afa872c5610afa8aa34a195eb1239",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a043ea4d2e8ccd7cc01075e138e254b4f26df5cc49e7b40a0fedcacd970e264c04a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01a1d26d88f5ae3ce2ee984180f0b3e39a29afa872c5610afa8aa34a195eb1239a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a3a1213b23b0c13887763a502ee9c3c9ba47d374a7b424d42bc15a21b1493369b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301588f8203e880a0a95e54c77fe9f62407bbac071f73d018e2666e70941fc6c7832a06ebe8ab7f1a88cf6c9da7b9ea0cdaf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x43ea4d2e8ccd7cc01075e138e254b4f26df5cc49e7b40a0fedcacd970e264c04",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xeb6e478d59be7c8381b9cafc24e3859ce3807813c4ca247241adfbb00fcebce2",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb6e478d59be7c8381b9cafc24e3859ce3807813c4ca247241adfbb00fcebce2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7cf8f7d6aa060fdab745ef904d67857be322597dd82549bfc880f7d1518b8b82",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5588f",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762a771",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcallcodecall_010_OOGE_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/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "2dbbf989e2d00c74c20e5fe93bc5f7e7c87b267ce1761cc0b44b44d5c4cba697"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x01588f",
-                    "hash" : "0xafcdd8b55e83f7763ef3fcf2493cf370ffaebf3ce0d869fdcca108413e7a981d",
-                    "mixHash" : "0x299c27f69ad40fc8e1f31ac289b80c5d4d4746846e4bb38d850197b05932d948",
-                    "nonce" : "0x47494ebfb7d6042d",
-                    "number" : "0x01",
-                    "parentHash" : "0x43ea4d2e8ccd7cc01075e138e254b4f26df5cc49e7b40a0fedcacd970e264c04",
-                    "receiptTrie" : "0xa3a1213b23b0c13887763a502ee9c3c9ba47d374a7b424d42bc15a21b1493369",
-                    "stateRoot" : "0x1a1d26d88f5ae3ce2ee984180f0b3e39a29afa872c5610afa8aa34a195eb1239",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a043ea4d2e8ccd7cc01075e138e254b4f26df5cc49e7b40a0fedcacd970e264c04a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01a1d26d88f5ae3ce2ee984180f0b3e39a29afa872c5610afa8aa34a195eb1239a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a3a1213b23b0c13887763a502ee9c3c9ba47d374a7b424d42bc15a21b1493369b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301588f8203e880a0299c27f69ad40fc8e1f31ac289b80c5d4d4746846e4bb38d850197b05932d9488847494ebfb7d6042df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x43ea4d2e8ccd7cc01075e138e254b4f26df5cc49e7b40a0fedcacd970e264c04",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xeb6e478d59be7c8381b9cafc24e3859ce3807813c4ca247241adfbb00fcebce2",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb6e478d59be7c8381b9cafc24e3859ce3807813c4ca247241adfbb00fcebce2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xafcdd8b55e83f7763ef3fcf2493cf370ffaebf3ce0d869fdcca108413e7a981d",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5588f",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762a771",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcallcodecall_010_OOGE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "2dbbf989e2d00c74c20e5fe93bc5f7e7c87b267ce1761cc0b44b44d5c4cba697"
+            "sourceHash" : "c9ea8b3dd7a7e5cf39f99a150b99f5ace87de276cd5389c1cc918452bef71183"
         },
         "blocks" : [
             {
@@ -469,9 +167,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "0x22fce09cb69bca8fe0461d7428671c511391546ced9a5f07b132ae0b85a9ae6f",
-                    "mixHash" : "0xc1345427013f25b387b120676cc66deb8d7f96b76469af29cf6cb8c1314033a6",
-                    "nonce" : "0xa1343f1f9160a481",
+                    "hash" : "0x592356d6280277be36f9838c4d60718cb258c61efb047d23680a5b9bb701a93a",
+                    "mixHash" : "0x5891bc82bc4736b0186e4cd262a22f8f7735254a7d9d6c4bd2c680dec4be1a33",
+                    "nonce" : "0xad53e299bab15f8d",
                     "number" : "0x01",
                     "parentHash" : "0x43ea4d2e8ccd7cc01075e138e254b4f26df5cc49e7b40a0fedcacd970e264c04",
                     "receiptTrie" : "0x209726a10a66b0719b11fe4b6e787181f8495feaedea9e43b21bf5cfad43dc9e",
@@ -480,10 +178,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a043ea4d2e8ccd7cc01075e138e254b4f26df5cc49e7b40a0fedcacd970e264c04a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0287f0f33a929dd70f6aefa30a4af9477296ee05e3a4de9c7f978fe52f924693ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0209726a10a66b0719b11fe4b6e787181f8495feaedea9e43b21bf5cfad43dc9eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0c1345427013f25b387b120676cc66deb8d7f96b76469af29cf6cb8c1314033a688a1343f1f9160a481f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a043ea4d2e8ccd7cc01075e138e254b4f26df5cc49e7b40a0fedcacd970e264c04a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0287f0f33a929dd70f6aefa30a4af9477296ee05e3a4de9c7f978fe52f924693ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0209726a10a66b0719b11fe4b6e787181f8495feaedea9e43b21bf5cfad43dc9eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a05891bc82bc4736b0186e4cd262a22f8f7735254a7d9d6c4bd2c680dec4be1a3388ad53e299bab15f8df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -517,7 +215,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb6e478d59be7c8381b9cafc24e3859ce3807813c4ca247241adfbb00fcebce2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x22fce09cb69bca8fe0461d7428671c511391546ced9a5f07b132ae0b85a9ae6f",
+        "lastblockhash" : "0x592356d6280277be36f9838c4d60718cb258c61efb047d23680a5b9bb701a93a",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -600,156 +298,5 @@
                 }
             }
         }
-    },
-    "callcallcodecall_010_OOGE_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/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "2dbbf989e2d00c74c20e5fe93bc5f7e7c87b267ce1761cc0b44b44d5c4cba697"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150d3",
-                    "hash" : "0x39e9d4e202506b86d2d674b168ab9451fd325ae1d804589d0142fa492445b5b9",
-                    "mixHash" : "0x528fefe4b66e898410379a341a12f8cf3db395e42dcd1392d02b38b8866b6828",
-                    "nonce" : "0x6aae2ccb4d615a38",
-                    "number" : "0x01",
-                    "parentHash" : "0x43ea4d2e8ccd7cc01075e138e254b4f26df5cc49e7b40a0fedcacd970e264c04",
-                    "receiptTrie" : "0x775c780fc46025253ed0b7be85a47c8965c3f2f00246d9ebc02c1b564eaa6f2c",
-                    "stateRoot" : "0xa01e71b15d294e4f23f2b8214a4d0fd24d4d34c8dc29168c6eba29880a5db8e3",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a043ea4d2e8ccd7cc01075e138e254b4f26df5cc49e7b40a0fedcacd970e264c04a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a01e71b15d294e4f23f2b8214a4d0fd24d4d34c8dc29168c6eba29880a5db8e3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0775c780fc46025253ed0b7be85a47c8965c3f2f00246d9ebc02c1b564eaa6f2cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d38203e880a0528fefe4b66e898410379a341a12f8cf3db395e42dcd1392d02b38b8866b6828886aae2ccb4d615a38f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x43ea4d2e8ccd7cc01075e138e254b4f26df5cc49e7b40a0fedcacd970e264c04",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xeb6e478d59be7c8381b9cafc24e3859ce3807813c4ca247241adfbb00fcebce2",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb6e478d59be7c8381b9cafc24e3859ce3807813c4ca247241adfbb00fcebce2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x39e9d4e202506b86d2d674b168ab9451fd325ae1d804589d0142fa492445b5b9",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550d3",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af2d",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfter_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfter_d0g0v0.json
index 83bbfdf3f..5c6aad784 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfter_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfter_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "5761c6c51332042e4e1885277714d166cbdf09be25877f6ca0e863f8b07ba4b6"
+            "sourceHash" : "be535749d6942c7f6856f87bc394ea84cc19798baee8eb219d9ad4793543a636"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f7",
-                    "hash" : "0xad46c326a9e59f39a1ad454f15365e67277e05d239deb16bd835d8b295650fe5",
-                    "mixHash" : "0xdad93bbb4a7210f10317f57eeed47202618dda619ad37a06e8dd6cbab50f28e5",
-                    "nonce" : "0xe64e8842155f2bff",
+                    "hash" : "0x370583dec6e3100513bdc9f4d68f79f896d6f3282405de4b077ddb0f939dc011",
+                    "mixHash" : "0xbedbb6cec208dcbe58b48cd82517ca84720aa6f33d62266f2decea1ec81cbd99",
+                    "nonce" : "0x1359e397463b5b39",
                     "number" : "0x01",
                     "parentHash" : "0x2ab5cac126f08e39fbf0f7d8764a6aebd3a71ec856079845bb8faed748bbde18",
                     "receiptTrie" : "0x7b32f6865ba11d16b4c8e757d35f80e1ea3ddb33d2b2fc644a01c5a2bbb5ba1f",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02ab5cac126f08e39fbf0f7d8764a6aebd3a71ec856079845bb8faed748bbde18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02aac97c679b6383d0500ea96213b1800edec3725c51369e049dc11c161242b4ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07b32f6865ba11d16b4c8e757d35f80e1ea3ddb33d2b2fc644a01c5a2bbb5ba1fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f78203e880a0dad93bbb4a7210f10317f57eeed47202618dda619ad37a06e8dd6cbab50f28e588e64e8842155f2bfff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a02ab5cac126f08e39fbf0f7d8764a6aebd3a71ec856079845bb8faed748bbde18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02aac97c679b6383d0500ea96213b1800edec3725c51369e049dc11c161242b4ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea07b32f6865ba11d16b4c8e757d35f80e1ea3ddb33d2b2fc644a01c5a2bbb5ba1fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f78203e880a0bedbb6cec208dcbe58b48cd82517ca84720aa6f33d62266f2decea1ec81cbd99881359e397463b5b39f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01da92cef5f52af69c159d1a836ce44a8f6a7b7a4313e25f0a30c9884f52844b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xad46c326a9e59f39a1ad454f15365e67277e05d239deb16bd835d8b295650fe5",
+        "lastblockhash" : "0x370583dec6e3100513bdc9f4d68f79f896d6f3282405de4b077ddb0f939dc011",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -149,313 +149,13 @@
             }
         }
     },
-    "callcallcodecall_010_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "5761c6c51332042e4e1885277714d166cbdf09be25877f6ca0e863f8b07ba4b6"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155f7",
-                    "hash" : "0x6e41dd7f3ffba9d1e847db108bbe9aa0e619779e8cb1f3e1f71eeb64118a5307",
-                    "mixHash" : "0xed04fe76b1fd7234d8133c2e25078bb97014cfeb17b65006aded8cdabb25484f",
-                    "nonce" : "0xa00576b52f2a9c43",
-                    "number" : "0x01",
-                    "parentHash" : "0x2ab5cac126f08e39fbf0f7d8764a6aebd3a71ec856079845bb8faed748bbde18",
-                    "receiptTrie" : "0x78de38a1cc5bc070882d75997e6524adaf261e428663c3ddd46b2518cec5fd84",
-                    "stateRoot" : "0xa95688229630019b545de2594ae92848cee2ece44c560b8a8982a050bd34e7a1",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a02ab5cac126f08e39fbf0f7d8764a6aebd3a71ec856079845bb8faed748bbde18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a95688229630019b545de2594ae92848cee2ece44c560b8a8982a050bd34e7a1a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea078de38a1cc5bc070882d75997e6524adaf261e428663c3ddd46b2518cec5fd84b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f78203e880a0ed04fe76b1fd7234d8133c2e25078bb97014cfeb17b65006aded8cdabb25484f88a00576b52f2a9c43f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x2ab5cac126f08e39fbf0f7d8764a6aebd3a71ec856079845bb8faed748bbde18",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x1da92cef5f52af69c159d1a836ce44a8f6a7b7a4313e25f0a30c9884f52844b1",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01da92cef5f52af69c159d1a836ce44a8f6a7b7a4313e25f0a30c9884f52844b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6e41dd7f3ffba9d1e847db108bbe9aa0e619779e8cb1f3e1f71eeb64118a5307",
-        "network" : "EIP150",
-        "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_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/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "5761c6c51332042e4e1885277714d166cbdf09be25877f6ca0e863f8b07ba4b6"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155f7",
-                    "hash" : "0x850485a190b9fed1a228258ce7545bf272249219288704eea44856bc43b7988d",
-                    "mixHash" : "0xcf2a518478913414d302036481e96f8f56c11e76cf0b92a2de1459e0836a21ab",
-                    "nonce" : "0x658d13391c49a5e8",
-                    "number" : "0x01",
-                    "parentHash" : "0x2ab5cac126f08e39fbf0f7d8764a6aebd3a71ec856079845bb8faed748bbde18",
-                    "receiptTrie" : "0x78de38a1cc5bc070882d75997e6524adaf261e428663c3ddd46b2518cec5fd84",
-                    "stateRoot" : "0xa95688229630019b545de2594ae92848cee2ece44c560b8a8982a050bd34e7a1",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a02ab5cac126f08e39fbf0f7d8764a6aebd3a71ec856079845bb8faed748bbde18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a95688229630019b545de2594ae92848cee2ece44c560b8a8982a050bd34e7a1a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea078de38a1cc5bc070882d75997e6524adaf261e428663c3ddd46b2518cec5fd84b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f78203e880a0cf2a518478913414d302036481e96f8f56c11e76cf0b92a2de1459e0836a21ab88658d13391c49a5e8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x2ab5cac126f08e39fbf0f7d8764a6aebd3a71ec856079845bb8faed748bbde18",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x1da92cef5f52af69c159d1a836ce44a8f6a7b7a4313e25f0a30c9884f52844b1",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01da92cef5f52af69c159d1a836ce44a8f6a7b7a4313e25f0a30c9884f52844b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x850485a190b9fed1a228258ce7545bf272249219288704eea44856bc43b7988d",
-        "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_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "5761c6c51332042e4e1885277714d166cbdf09be25877f6ca0e863f8b07ba4b6"
+            "sourceHash" : "be535749d6942c7f6856f87bc394ea84cc19798baee8eb219d9ad4793543a636"
         },
         "blocks" : [
             {
@@ -466,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cd",
-                    "hash" : "0x48c06b5a537fac40c65d43a4b5ddad6d080cebc1cc967d4eae4b0ae833e4cf1d",
-                    "mixHash" : "0x9490c7a55ff69b66a2b8e1934b457b0b0dbec109aeed27c84d0cdc3d8a1d29ba",
-                    "nonce" : "0x9c8b03161d288ac8",
+                    "hash" : "0x594ae12273863add9a4874be13e1149ea478202d90993e8a55d9f61148a7ae51",
+                    "mixHash" : "0x7b446bfece07b7147943a107f9c940577b418e66f449b2a5966990da4b23ce44",
+                    "nonce" : "0x327ed4c50261e848",
                     "number" : "0x01",
                     "parentHash" : "0x2ab5cac126f08e39fbf0f7d8764a6aebd3a71ec856079845bb8faed748bbde18",
                     "receiptTrie" : "0x44ddc52220f9aee4b7a46e2b9211e884746bfed8b1f4c6af23d5f48c8e714be6",
@@ -477,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02ab5cac126f08e39fbf0f7d8764a6aebd3a71ec856079845bb8faed748bbde18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5def02563677036b2880a12575ce0e1cbaf250af631c9e1f792c6bea139ac0aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea044ddc52220f9aee4b7a46e2b9211e884746bfed8b1f4c6af23d5f48c8e714be6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cd8203e880a09490c7a55ff69b66a2b8e1934b457b0b0dbec109aeed27c84d0cdc3d8a1d29ba889c8b03161d288ac8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a02ab5cac126f08e39fbf0f7d8764a6aebd3a71ec856079845bb8faed748bbde18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5def02563677036b2880a12575ce0e1cbaf250af631c9e1f792c6bea139ac0aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea044ddc52220f9aee4b7a46e2b9211e884746bfed8b1f4c6af23d5f48c8e714be6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cd8203e880a07b446bfece07b7147943a107f9c940577b418e66f449b2a5966990da4b23ce4488327ed4c50261e848f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -514,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01da92cef5f52af69c159d1a836ce44a8f6a7b7a4313e25f0a30c9884f52844b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x48c06b5a537fac40c65d43a4b5ddad6d080cebc1cc967d4eae4b0ae833e4cf1d",
+        "lastblockhash" : "0x594ae12273863add9a4874be13e1149ea478202d90993e8a55d9f61148a7ae51",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -601,10 +301,10 @@
     "callcallcodecall_010_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "5761c6c51332042e4e1885277714d166cbdf09be25877f6ca0e863f8b07ba4b6"
+            "sourceHash" : "be535749d6942c7f6856f87bc394ea84cc19798baee8eb219d9ad4793543a636"
         },
         "blocks" : [
             {
@@ -615,9 +315,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150cd",
-                    "hash" : "0x67e9bfe68399f07ef82987fb4d5ccc811411e020a9ad2b8c2abbd8d382c8b219",
-                    "mixHash" : "0x20a2e9e2cc754afc5daa6b1b2112832290d2c1cf2585c1b856359ec282363b86",
-                    "nonce" : "0x0779debf691c1286",
+                    "hash" : "0x4fc38654b5e852371eb5887b893f996906dddf266273a5b36ecdcb4f5cef4d0a",
+                    "mixHash" : "0x7922d0762a3b5fdcb8f8523b6b46f22d0b13d7956c7e5847052457af10d65f2e",
+                    "nonce" : "0xdbb0b2d881b1fa9e",
                     "number" : "0x01",
                     "parentHash" : "0x2ab5cac126f08e39fbf0f7d8764a6aebd3a71ec856079845bb8faed748bbde18",
                     "receiptTrie" : "0x44ddc52220f9aee4b7a46e2b9211e884746bfed8b1f4c6af23d5f48c8e714be6",
@@ -626,10 +326,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02ab5cac126f08e39fbf0f7d8764a6aebd3a71ec856079845bb8faed748bbde18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5def02563677036b2880a12575ce0e1cbaf250af631c9e1f792c6bea139ac0aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea044ddc52220f9aee4b7a46e2b9211e884746bfed8b1f4c6af23d5f48c8e714be6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cd8203e880a020a2e9e2cc754afc5daa6b1b2112832290d2c1cf2585c1b856359ec282363b86880779debf691c1286f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a02ab5cac126f08e39fbf0f7d8764a6aebd3a71ec856079845bb8faed748bbde18a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5def02563677036b2880a12575ce0e1cbaf250af631c9e1f792c6bea139ac0aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea044ddc52220f9aee4b7a46e2b9211e884746bfed8b1f4c6af23d5f48c8e714be6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cd8203e880a07922d0762a3b5fdcb8f8523b6b46f22d0b13d7956c7e5847052457af10d65f2e88dbb0b2d881b1fa9ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -663,7 +363,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01da92cef5f52af69c159d1a836ce44a8f6a7b7a4313e25f0a30c9884f52844b1a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x67e9bfe68399f07ef82987fb4d5ccc811411e020a9ad2b8c2abbd8d382c8b219",
+        "lastblockhash" : "0x4fc38654b5e852371eb5887b893f996906dddf266273a5b36ecdcb4f5cef4d0a",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBefore_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBefore_d0g0v0.json
index c3be04b24..b074bf936 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBefore_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBefore_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_OOGMBefore_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "97ad1f645fb54b7e2a178c8762ec68dcab78be210086b190f42b6f320c7c8893"
+            "sourceHash" : "bf2ae1ee5f35bcbe10a0a6f94a545d561ea1fcb5cf622a09f4f27a408fae7d32"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f5",
-                    "hash" : "0xbd67d195d7396d2f6bd8b633489fec0ac257ea4c93a43225724299e186212856",
-                    "mixHash" : "0x2259e5d26dfdf1294109b020da04568f24a7ad1052ab0278c00573c6400ecb31",
-                    "nonce" : "0x775a6e5b15ba39c6",
+                    "hash" : "0x1ec5366f4d637c5c0e09c5b20b39558586f689dcfbc047092ebe413bca3c01eb",
+                    "mixHash" : "0xb3c5bf369dd28951c39b8be99aeedce10430b9fde42197208a5b9e5642bf85fe",
+                    "nonce" : "0x772551e30ade05ea",
                     "number" : "0x01",
                     "parentHash" : "0x22d0c6bf0b250a9a0508e67cf7c61026e5ebd1e3a8dcfea134eddf72d61c1485",
                     "receiptTrie" : "0x0eb4fb5e1b08340d1947932bf960a1c1fd7e40bfdbe3742eb2b2499d848ac29a",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a022d0c6bf0b250a9a0508e67cf7c61026e5ebd1e3a8dcfea134eddf72d61c1485a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00516f37b1ada38628f9b5f680a456bbf15c580f7fbec15e5991237c41f1b11aea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00eb4fb5e1b08340d1947932bf960a1c1fd7e40bfdbe3742eb2b2499d848ac29ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f58203e880a02259e5d26dfdf1294109b020da04568f24a7ad1052ab0278c00573c6400ecb3188775a6e5b15ba39c6f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a022d0c6bf0b250a9a0508e67cf7c61026e5ebd1e3a8dcfea134eddf72d61c1485a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00516f37b1ada38628f9b5f680a456bbf15c580f7fbec15e5991237c41f1b11aea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00eb4fb5e1b08340d1947932bf960a1c1fd7e40bfdbe3742eb2b2499d848ac29ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f58203e880a0b3c5bf369dd28951c39b8be99aeedce10430b9fde42197208a5b9e5642bf85fe88772551e30ade05eaf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05187bf7d654eefceda5b18670135209f8144193731b7cae0533267ec86fe66c0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbd67d195d7396d2f6bd8b633489fec0ac257ea4c93a43225724299e186212856",
+        "lastblockhash" : "0x1ec5366f4d637c5c0e09c5b20b39558586f689dcfbc047092ebe413bca3c01eb",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -149,313 +149,13 @@
             }
         }
     },
-    "callcallcodecall_010_OOGMBefore_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "97ad1f645fb54b7e2a178c8762ec68dcab78be210086b190f42b6f320c7c8893"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155f5",
-                    "hash" : "0xf58bca44411132432495ec4e0dbfc4c39d282ca84f1c7193d563c25e171b58f5",
-                    "mixHash" : "0x150f0a35cd9a8aedcf553faffd823b994d89f82d37e80be38f29d81a0911f05e",
-                    "nonce" : "0x70dfc52e2e7c46b7",
-                    "number" : "0x01",
-                    "parentHash" : "0x22d0c6bf0b250a9a0508e67cf7c61026e5ebd1e3a8dcfea134eddf72d61c1485",
-                    "receiptTrie" : "0x39c783159e8593e2e4b492881087fbb39e6e5043769ea116833398c9c2ca005b",
-                    "stateRoot" : "0xef597cfde5ba8494ba12dcaac5aa5d55086849722e41646084f9ef8d1cba3d7c",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a022d0c6bf0b250a9a0508e67cf7c61026e5ebd1e3a8dcfea134eddf72d61c1485a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef597cfde5ba8494ba12dcaac5aa5d55086849722e41646084f9ef8d1cba3d7ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea039c783159e8593e2e4b492881087fbb39e6e5043769ea116833398c9c2ca005bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f58203e880a0150f0a35cd9a8aedcf553faffd823b994d89f82d37e80be38f29d81a0911f05e8870dfc52e2e7c46b7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x22d0c6bf0b250a9a0508e67cf7c61026e5ebd1e3a8dcfea134eddf72d61c1485",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x5187bf7d654eefceda5b18670135209f8144193731b7cae0533267ec86fe66c0",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05187bf7d654eefceda5b18670135209f8144193731b7cae0533267ec86fe66c0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf58bca44411132432495ec4e0dbfc4c39d282ca84f1c7193d563c25e171b58f5",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000162011206f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c94f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555f5",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa0b",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000162011206f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c94f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcallcodecall_010_OOGMBefore_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/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "97ad1f645fb54b7e2a178c8762ec68dcab78be210086b190f42b6f320c7c8893"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155f5",
-                    "hash" : "0xc11b370f7cc3264437f2fcb9ce56ac8e5496cd7ffc83d71a088ab1d6365ee338",
-                    "mixHash" : "0x87159022e6784d2c25efff9659cd020ad1bd8987ca6e3dbaf4c5457a31362cba",
-                    "nonce" : "0x9dc95cf99bd8d89e",
-                    "number" : "0x01",
-                    "parentHash" : "0x22d0c6bf0b250a9a0508e67cf7c61026e5ebd1e3a8dcfea134eddf72d61c1485",
-                    "receiptTrie" : "0x39c783159e8593e2e4b492881087fbb39e6e5043769ea116833398c9c2ca005b",
-                    "stateRoot" : "0xef597cfde5ba8494ba12dcaac5aa5d55086849722e41646084f9ef8d1cba3d7c",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a022d0c6bf0b250a9a0508e67cf7c61026e5ebd1e3a8dcfea134eddf72d61c1485a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef597cfde5ba8494ba12dcaac5aa5d55086849722e41646084f9ef8d1cba3d7ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea039c783159e8593e2e4b492881087fbb39e6e5043769ea116833398c9c2ca005bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f58203e880a087159022e6784d2c25efff9659cd020ad1bd8987ca6e3dbaf4c5457a31362cba889dc95cf99bd8d89ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x22d0c6bf0b250a9a0508e67cf7c61026e5ebd1e3a8dcfea134eddf72d61c1485",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x5187bf7d654eefceda5b18670135209f8144193731b7cae0533267ec86fe66c0",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05187bf7d654eefceda5b18670135209f8144193731b7cae0533267ec86fe66c0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc11b370f7cc3264437f2fcb9ce56ac8e5496cd7ffc83d71a088ab1d6365ee338",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000162011206f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c94f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555f5",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa0b",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000162011206f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c94f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcallcodecall_010_OOGMBefore_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "97ad1f645fb54b7e2a178c8762ec68dcab78be210086b190f42b6f320c7c8893"
+            "sourceHash" : "bf2ae1ee5f35bcbe10a0a6f94a545d561ea1fcb5cf622a09f4f27a408fae7d32"
         },
         "blocks" : [
             {
@@ -466,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0177dc",
-                    "hash" : "0x8c2e1e7500319810b20d0c7358bc1de94e5a4e7c3efd3612152ae3f8422ab68d",
-                    "mixHash" : "0xf4a0dc79d969664d675861b429c14c2f52c0ad519195403660e5531d95722654",
-                    "nonce" : "0xcc65e3bd0c371c23",
+                    "hash" : "0xbc02374b8e7b3c4011e14f2f1ddcba5c262cce6f756fc3ba78b5b64e22846fc0",
+                    "mixHash" : "0x3786acc40ec25a199286e014167da6403f281a86a570291925dbbf6060d1e5e3",
+                    "nonce" : "0xe8c015302cd55f2a",
                     "number" : "0x01",
                     "parentHash" : "0x22d0c6bf0b250a9a0508e67cf7c61026e5ebd1e3a8dcfea134eddf72d61c1485",
                     "receiptTrie" : "0xe024874b1e16ced06c9481d990ef112bc1b05b3079bd3650d657f2029f682b69",
@@ -477,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a022d0c6bf0b250a9a0508e67cf7c61026e5ebd1e3a8dcfea134eddf72d61c1485a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a9b963bf88f9d5d8cf79f4d80935683b73cc1046c8b02d4db08933d0ebfd7ee1a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e024874b1e16ced06c9481d990ef112bc1b05b3079bd3650d657f2029f682b69b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830177dc8203e880a0f4a0dc79d969664d675861b429c14c2f52c0ad519195403660e5531d9572265488cc65e3bd0c371c23f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a022d0c6bf0b250a9a0508e67cf7c61026e5ebd1e3a8dcfea134eddf72d61c1485a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a9b963bf88f9d5d8cf79f4d80935683b73cc1046c8b02d4db08933d0ebfd7ee1a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e024874b1e16ced06c9481d990ef112bc1b05b3079bd3650d657f2029f682b69b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830177dc8203e880a03786acc40ec25a199286e014167da6403f281a86a570291925dbbf6060d1e5e388e8c015302cd55f2af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -514,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05187bf7d654eefceda5b18670135209f8144193731b7cae0533267ec86fe66c0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8c2e1e7500319810b20d0c7358bc1de94e5a4e7c3efd3612152ae3f8422ab68d",
+        "lastblockhash" : "0xbc02374b8e7b3c4011e14f2f1ddcba5c262cce6f756fc3ba78b5b64e22846fc0",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -597,155 +297,5 @@
                 }
             }
         }
-    },
-    "callcallcodecall_010_OOGMBefore_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/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "97ad1f645fb54b7e2a178c8762ec68dcab78be210086b190f42b6f320c7c8893"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150cd",
-                    "hash" : "0x1a655e411e1ce97212385759874e1226108540904e76e0bd2d5ba32bf42bc449",
-                    "mixHash" : "0x1aaae6195a3f2178f02107f848e4c754122cd5cc6d76a611a27f39b6a364711f",
-                    "nonce" : "0xe3a7829d79678723",
-                    "number" : "0x01",
-                    "parentHash" : "0x22d0c6bf0b250a9a0508e67cf7c61026e5ebd1e3a8dcfea134eddf72d61c1485",
-                    "receiptTrie" : "0x9a80c4abf7a4eb9ee6f430cc0ba07e77e1fd17ed81d566d29c9d3119dcedba72",
-                    "stateRoot" : "0xe78db0e77b9f278bdc8f9f6b555bda218fcdaf59335bcd61cefc435f9c65ff01",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a022d0c6bf0b250a9a0508e67cf7c61026e5ebd1e3a8dcfea134eddf72d61c1485a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e78db0e77b9f278bdc8f9f6b555bda218fcdaf59335bcd61cefc435f9c65ff01a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09a80c4abf7a4eb9ee6f430cc0ba07e77e1fd17ed81d566d29c9d3119dcedba72b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cd8203e880a01aaae6195a3f2178f02107f848e4c754122cd5cc6d76a611a27f39b6a364711f88e3a7829d79678723f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x22d0c6bf0b250a9a0508e67cf7c61026e5ebd1e3a8dcfea134eddf72d61c1485",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x5187bf7d654eefceda5b18670135209f8144193731b7cae0533267ec86fe66c0",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05187bf7d654eefceda5b18670135209f8144193731b7cae0533267ec86fe66c0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1a655e411e1ce97212385759874e1226108540904e76e0bd2d5ba32bf42bc449",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000162011206f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c94f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "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" : "0x6040600060406000600073100000000000000000000000000000000000000162011206f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c94f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "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/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEnd_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEnd_d0g0v0.json
index cf9979688..1054b3bc7 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEnd_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEnd_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_SuicideEnd_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "5a4ac4254aadb839b16982af2d357b0eb01c7acf53810ba05687ac3847271c82"
+            "sourceHash" : "04b82d730314d6d83b355bd3d122e1421d430315feaf52498d6c8e98ebdc8e5e"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e4",
-                    "hash" : "0xcf8ec7ddab9d946ff5b6a2113d0f3df0b3b786415adb6784ddc695dfa855ad20",
-                    "mixHash" : "0x268f98e5cf431c6a0e30d6351e61ad73482dbea30c6b05297a4a4eed292b36e3",
-                    "nonce" : "0xb9f248c00170b2cf",
+                    "hash" : "0x86e20904876053e2945b8ff35af083e0c59732d00be728b7c186ed8221c38397",
+                    "mixHash" : "0xa31341deba68eff873923ced75fa4fdbbd37c5acc0f87fc23d964a0a16b37ddf",
+                    "nonce" : "0x778d1e468c0b924e",
                     "number" : "0x01",
                     "parentHash" : "0x123d7d96fe93458bac59277a02273669884f2b73e68449dda53dc5c27210eb49",
                     "receiptTrie" : "0xdfa6ff2e20e86a464bba21d71080772ef64ad6e872e20bbbc24c6bd5a5856dd0",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0123d7d96fe93458bac59277a02273669884f2b73e68449dda53dc5c27210eb49a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de3520305d8cb05df196d85a3f1c7f611493202838b03c479378e19f6f4a8784a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0dfa6ff2e20e86a464bba21d71080772ef64ad6e872e20bbbc24c6bd5a5856dd0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e48203e880a0268f98e5cf431c6a0e30d6351e61ad73482dbea30c6b05297a4a4eed292b36e388b9f248c00170b2cff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0123d7d96fe93458bac59277a02273669884f2b73e68449dda53dc5c27210eb49a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de3520305d8cb05df196d85a3f1c7f611493202838b03c479378e19f6f4a8784a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0dfa6ff2e20e86a464bba21d71080772ef64ad6e872e20bbbc24c6bd5a5856dd0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e48203e880a0a31341deba68eff873923ced75fa4fdbbd37c5acc0f87fc23d964a0a16b37ddf88778d1e468c0b924ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001c080820be876ac390ad790ac294e4fe67a66d4621240c5aa9d2cd11e404d94a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcf8ec7ddab9d946ff5b6a2113d0f3df0b3b786415adb6784ddc695dfa855ad20",
+        "lastblockhash" : "0x86e20904876053e2945b8ff35af083e0c59732d00be728b7c186ed8221c38397",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -141,297 +141,13 @@
             }
         }
     },
-    "callcallcodecall_010_SuicideEnd_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "5a4ac4254aadb839b16982af2d357b0eb01c7acf53810ba05687ac3847271c82"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0148e4",
-                    "hash" : "0xf3916c5a31f0a4e4713123b1803ecb21b78ea47698fa88579ff4618d2c94fcce",
-                    "mixHash" : "0xdf56c50a50599d00b74975cc79346ec67ed0a4d868002c9cb6f246df52aad5e9",
-                    "nonce" : "0x393a2c46cbdb726d",
-                    "number" : "0x01",
-                    "parentHash" : "0x123d7d96fe93458bac59277a02273669884f2b73e68449dda53dc5c27210eb49",
-                    "receiptTrie" : "0x85688c0a4fa4569f6d8d3091b20d3dbd2dfef2f26d3e64369750d134f7b078f6",
-                    "stateRoot" : "0xd0be21dee5e7767c03984343a676e8e2dca04aafdaa829aa5111ff7cb5271ee3",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0123d7d96fe93458bac59277a02273669884f2b73e68449dda53dc5c27210eb49a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d0be21dee5e7767c03984343a676e8e2dca04aafdaa829aa5111ff7cb5271ee3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a085688c0a4fa4569f6d8d3091b20d3dbd2dfef2f26d3e64369750d134f7b078f6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e48203e880a0df56c50a50599d00b74975cc79346ec67ed0a4d868002c9cb6f246df52aad5e988393a2c46cbdb726df862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x123d7d96fe93458bac59277a02273669884f2b73e68449dda53dc5c27210eb49",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x01c080820be876ac390ad790ac294e4fe67a66d4621240c5aa9d2cd11e404d94",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001c080820be876ac390ad790ac294e4fe67a66d4621240c5aa9d2cd11e404d94a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf3916c5a31f0a4e4713123b1803ecb21b78ea47698fa88579ff4618d2c94fcce",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b5fb6fe400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548e4",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762b71c",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcallcodecall_010_SuicideEnd_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/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "5a4ac4254aadb839b16982af2d357b0eb01c7acf53810ba05687ac3847271c82"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0148e4",
-                    "hash" : "0x7babd23ee7e61322206e25710cd1894ad197f216584c3b492f9cf1e0ad3131ae",
-                    "mixHash" : "0xaf0443e685d0416b9f251f1b14a52e58956cda0493155bca4796cd18a5a30b4c",
-                    "nonce" : "0x17bbc66d38c2331d",
-                    "number" : "0x01",
-                    "parentHash" : "0x123d7d96fe93458bac59277a02273669884f2b73e68449dda53dc5c27210eb49",
-                    "receiptTrie" : "0x85688c0a4fa4569f6d8d3091b20d3dbd2dfef2f26d3e64369750d134f7b078f6",
-                    "stateRoot" : "0xd0be21dee5e7767c03984343a676e8e2dca04aafdaa829aa5111ff7cb5271ee3",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0123d7d96fe93458bac59277a02273669884f2b73e68449dda53dc5c27210eb49a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d0be21dee5e7767c03984343a676e8e2dca04aafdaa829aa5111ff7cb5271ee3a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a085688c0a4fa4569f6d8d3091b20d3dbd2dfef2f26d3e64369750d134f7b078f6b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e48203e880a0af0443e685d0416b9f251f1b14a52e58956cda0493155bca4796cd18a5a30b4c8817bbc66d38c2331df862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x123d7d96fe93458bac59277a02273669884f2b73e68449dda53dc5c27210eb49",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x01c080820be876ac390ad790ac294e4fe67a66d4621240c5aa9d2cd11e404d94",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001c080820be876ac390ad790ac294e4fe67a66d4621240c5aa9d2cd11e404d94a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7babd23ee7e61322206e25710cd1894ad197f216584c3b492f9cf1e0ad3131ae",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b5fb6fe400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548e4",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762b71c",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcallcodecall_010_SuicideEnd_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "5a4ac4254aadb839b16982af2d357b0eb01c7acf53810ba05687ac3847271c82"
+            "sourceHash" : "04b82d730314d6d83b355bd3d122e1421d430315feaf52498d6c8e98ebdc8e5e"
         },
         "blocks" : [
             {
@@ -442,9 +158,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x02afc6",
-                    "hash" : "0x6bc841538a8cc4e7f403e025e07f0fcf7a9048b55602e6833f4c22b6e0b58324",
-                    "mixHash" : "0x739445f13b2910e7397cac5bfd60870fabb162c515fb9716b4fab3984fdb34cf",
-                    "nonce" : "0x1f62e6d7eddaeab6",
+                    "hash" : "0x012eba8830f0105bff61f1d0cf3a93e43d11db98a1b1cdf602a4907d7f585c9a",
+                    "mixHash" : "0x74e9d15dcd043726fdfc5b2e5097a5eaac86f69b5d7edca30b2977a82613d696",
+                    "nonce" : "0xc909abba8ac56c86",
                     "number" : "0x01",
                     "parentHash" : "0x123d7d96fe93458bac59277a02273669884f2b73e68449dda53dc5c27210eb49",
                     "receiptTrie" : "0xc527e56764fdf4bbdb711b81cb381d62691a2242bd452b0f43773e4fad19a93e",
@@ -453,10 +169,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0123d7d96fe93458bac59277a02273669884f2b73e68449dda53dc5c27210eb49a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00dc0f9dca7c49398035102a4d75893607bd18a21ed6f142cb579ff1c54da633ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c527e56764fdf4bbdb711b81cb381d62691a2242bd452b0f43773e4fad19a93eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808302afc68203e880a0739445f13b2910e7397cac5bfd60870fabb162c515fb9716b4fab3984fdb34cf881f62e6d7eddaeab6f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0123d7d96fe93458bac59277a02273669884f2b73e68449dda53dc5c27210eb49a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00dc0f9dca7c49398035102a4d75893607bd18a21ed6f142cb579ff1c54da633ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c527e56764fdf4bbdb711b81cb381d62691a2242bd452b0f43773e4fad19a93eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808302afc68203e880a074e9d15dcd043726fdfc5b2e5097a5eaac86f69b5d7edca30b2977a82613d69688c909abba8ac56c86f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -490,7 +206,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001c080820be876ac390ad790ac294e4fe67a66d4621240c5aa9d2cd11e404d94a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6bc841538a8cc4e7f403e025e07f0fcf7a9048b55602e6833f4c22b6e0b58324",
+        "lastblockhash" : "0x012eba8830f0105bff61f1d0cf3a93e43d11db98a1b1cdf602a4907d7f585c9a",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -573,147 +289,5 @@
                 }
             }
         }
-    },
-    "callcallcodecall_010_SuicideEnd_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/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "5a4ac4254aadb839b16982af2d357b0eb01c7acf53810ba05687ac3847271c82"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x012da0",
-                    "hash" : "0x5df9da2cc84dd4ed22d86cff916cf457369850b38598754176391a0467eeea10",
-                    "mixHash" : "0x00826505a9ddd6a20be09336157328d93be756425575c0f88a432819e46b3c17",
-                    "nonce" : "0xf857b89d82078701",
-                    "number" : "0x01",
-                    "parentHash" : "0x123d7d96fe93458bac59277a02273669884f2b73e68449dda53dc5c27210eb49",
-                    "receiptTrie" : "0xd4b2f6b379876f12d64084e4c1117e87eb56a1e796278a2d144dcadaf1cbd374",
-                    "stateRoot" : "0x1fd9c981a1a8bb43791e6b8a45900f4c98e7ed9ed9d50f7d01487817d7d23b40",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0123d7d96fe93458bac59277a02273669884f2b73e68449dda53dc5c27210eb49a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01fd9c981a1a8bb43791e6b8a45900f4c98e7ed9ed9d50f7d01487817d7d23b40a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d4b2f6b379876f12d64084e4c1117e87eb56a1e796278a2d144dcadaf1cbd374b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da08203e880a000826505a9ddd6a20be09336157328d93be756425575c0f88a432819e46b3c1788f857b89d82078701f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x123d7d96fe93458bac59277a02273669884f2b73e68449dda53dc5c27210eb49",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x01c080820be876ac390ad790ac294e4fe67a66d4621240c5aa9d2cd11e404d94",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001c080820be876ac390ad790ac294e4fe67a66d4621240c5aa9d2cd11e404d94a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5df9da2cc84dd4ed22d86cff916cf457369850b38598754176391a0467eeea10",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b5fb6fe400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f52da0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762d260",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddle_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddle_d0g0v0.json
index 8254fb3bf..b3a374b1a 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddle_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddle_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_SuicideMiddle_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "3c0c5f2280fd18238f4335974319553000343be6915d4b283fc86253b0e94cb6"
+            "sourceHash" : "b0863e3feb97594d21d756e6fa9e48daf4bb0c4a0354243b50d3f114b5103757"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c4",
-                    "hash" : "0x845d33dbb4cb5a0819348cf049969c2ad386ac8a7e306fa44978395857672143",
-                    "mixHash" : "0xa0d305f01e3437ae9dc80ef04fe92f84350bdee33e94111911376aab7d31713c",
-                    "nonce" : "0x96ac7d37c93b1735",
+                    "hash" : "0x0d93d801458b79c24ef25d86c964b0def67b4aab768adfdcef725160485f7324",
+                    "mixHash" : "0x6a5639d49c61b3b026343b3635f786aeb0eba5a244c6c477d3bfa5e8a618c609",
+                    "nonce" : "0xb73a907de77ab83b",
                     "number" : "0x01",
                     "parentHash" : "0x5465075aad678244c26edf5218d493fba7edf96d43d4de8610002d32db45d30e",
                     "receiptTrie" : "0x9cfe338f99c36eb562687de6302f5f1018f7c7847c8593f83122637b4e445fb2",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a05465075aad678244c26edf5218d493fba7edf96d43d4de8610002d32db45d30ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05c7c41a43d37d5f8acdc29ddf561b645ea865cb058b46557db1ac5e63fe4a144a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09cfe338f99c36eb562687de6302f5f1018f7c7847c8593f83122637b4e445fb2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c48203e880a0a0d305f01e3437ae9dc80ef04fe92f84350bdee33e94111911376aab7d31713c8896ac7d37c93b1735f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a05465075aad678244c26edf5218d493fba7edf96d43d4de8610002d32db45d30ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05c7c41a43d37d5f8acdc29ddf561b645ea865cb058b46557db1ac5e63fe4a144a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09cfe338f99c36eb562687de6302f5f1018f7c7847c8593f83122637b4e445fb2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c48203e880a06a5639d49c61b3b026343b3635f786aeb0eba5a244c6c477d3bfa5e8a618c60988b73a907de77ab83bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0492165c97da9a9b0761d44646fe4e4e3f5593e6b527899a5037a81a8c407d688a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x845d33dbb4cb5a0819348cf049969c2ad386ac8a7e306fa44978395857672143",
+        "lastblockhash" : "0x0d93d801458b79c24ef25d86c964b0def67b4aab768adfdcef725160485f7324",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -141,297 +141,13 @@
             }
         }
     },
-    "callcallcodecall_010_SuicideMiddle_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "3c0c5f2280fd18238f4335974319553000343be6915d4b283fc86253b0e94cb6"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c4",
-                    "hash" : "0xb255d939bc76f9662d077514fbeb8d5d521d3cbdddd2f7162417cd05792f0140",
-                    "mixHash" : "0xf434548aa8c074b4e484aa3793130ae095ad186167394365e354deb927b02881",
-                    "nonce" : "0x2d0afef60d0ccbc1",
-                    "number" : "0x01",
-                    "parentHash" : "0x5465075aad678244c26edf5218d493fba7edf96d43d4de8610002d32db45d30e",
-                    "receiptTrie" : "0xfaa8e0d67ddbdb8b44822f6f7a2b07504eb51f49e03d1e13292310f5c9196ceb",
-                    "stateRoot" : "0x2d6f951dd5fb68b172d061a8921d20c02d2c21831da5347a45ce75a2e798242b",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a05465075aad678244c26edf5218d493fba7edf96d43d4de8610002d32db45d30ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d6f951dd5fb68b172d061a8921d20c02d2c21831da5347a45ce75a2e798242ba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0faa8e0d67ddbdb8b44822f6f7a2b07504eb51f49e03d1e13292310f5c9196cebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c48203e880a0f434548aa8c074b4e484aa3793130ae095ad186167394365e354deb927b02881882d0afef60d0ccbc1f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x5465075aad678244c26edf5218d493fba7edf96d43d4de8610002d32db45d30e",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x492165c97da9a9b0761d44646fe4e4e3f5593e6b527899a5037a81a8c407d688",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0492165c97da9a9b0761d44646fe4e4e3f5593e6b527899a5037a81a8c407d688a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb255d939bc76f9662d077514fbeb8d5d521d3cbdddd2f7162417cd05792f0140",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c4",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a763563c",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcallcodecall_010_SuicideMiddle_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/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "3c0c5f2280fd18238f4335974319553000343be6915d4b283fc86253b0e94cb6"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c4",
-                    "hash" : "0x5d18167d4ba8f16cc28de52d287dbc9a26ea1f2d3bd2cb7333d846019b788be4",
-                    "mixHash" : "0x0d2f4270d1f434fa9d53f96dd8d6a1b5ef5225f8fc2c6e6ce069fc85b1026817",
-                    "nonce" : "0x6ceb88a44a18cca2",
-                    "number" : "0x01",
-                    "parentHash" : "0x5465075aad678244c26edf5218d493fba7edf96d43d4de8610002d32db45d30e",
-                    "receiptTrie" : "0xfaa8e0d67ddbdb8b44822f6f7a2b07504eb51f49e03d1e13292310f5c9196ceb",
-                    "stateRoot" : "0x2d6f951dd5fb68b172d061a8921d20c02d2c21831da5347a45ce75a2e798242b",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a05465075aad678244c26edf5218d493fba7edf96d43d4de8610002d32db45d30ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d6f951dd5fb68b172d061a8921d20c02d2c21831da5347a45ce75a2e798242ba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0faa8e0d67ddbdb8b44822f6f7a2b07504eb51f49e03d1e13292310f5c9196cebb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c48203e880a00d2f4270d1f434fa9d53f96dd8d6a1b5ef5225f8fc2c6e6ce069fc85b1026817886ceb88a44a18cca2f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x5465075aad678244c26edf5218d493fba7edf96d43d4de8610002d32db45d30e",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x492165c97da9a9b0761d44646fe4e4e3f5593e6b527899a5037a81a8c407d688",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0492165c97da9a9b0761d44646fe4e4e3f5593e6b527899a5037a81a8c407d688a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5d18167d4ba8f16cc28de52d287dbc9a26ea1f2d3bd2cb7333d846019b788be4",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c4",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a763563c",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcallcodecall_010_SuicideMiddle_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "3c0c5f2280fd18238f4335974319553000343be6915d4b283fc86253b0e94cb6"
+            "sourceHash" : "b0863e3feb97594d21d756e6fa9e48daf4bb0c4a0354243b50d3f114b5103757"
         },
         "blocks" : [
             {
@@ -442,9 +158,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x02afc6",
-                    "hash" : "0xee32e7bdd2118a15aa8409508eea6dd6132ec8bdab56a4184ad80b7db4332a0d",
-                    "mixHash" : "0xe2ecde82e26a4aed42cd1f6419af147ec274b82d1f806d31be51e3c4d7deb592",
-                    "nonce" : "0x2df4b0f4de6774a5",
+                    "hash" : "0xe396236dad8b520f841f4aaec6ca860af4bc9a76ee5a2e2a0da5d6d802ae1862",
+                    "mixHash" : "0x92a423f49bad8a031fd230d26c110952c080ba74fd07f8da2592c745b6a74f36",
+                    "nonce" : "0x763d7f23265eeb6a",
                     "number" : "0x01",
                     "parentHash" : "0x5465075aad678244c26edf5218d493fba7edf96d43d4de8610002d32db45d30e",
                     "receiptTrie" : "0x204a1ab8f9006c70b9eddca8209667584a40d77d205c6fc29f59dc95a503ffa9",
@@ -453,10 +169,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a05465075aad678244c26edf5218d493fba7edf96d43d4de8610002d32db45d30ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f2631fbed15c2c88c3222c4eba776c69165b7b3f3d526c17bc8cd40284c541a2a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0204a1ab8f9006c70b9eddca8209667584a40d77d205c6fc29f59dc95a503ffa9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808302afc68203e880a0e2ecde82e26a4aed42cd1f6419af147ec274b82d1f806d31be51e3c4d7deb592882df4b0f4de6774a5f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a05465075aad678244c26edf5218d493fba7edf96d43d4de8610002d32db45d30ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f2631fbed15c2c88c3222c4eba776c69165b7b3f3d526c17bc8cd40284c541a2a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0204a1ab8f9006c70b9eddca8209667584a40d77d205c6fc29f59dc95a503ffa9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808302afc68203e880a092a423f49bad8a031fd230d26c110952c080ba74fd07f8da2592c745b6a74f3688763d7f23265eeb6af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -490,7 +206,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0492165c97da9a9b0761d44646fe4e4e3f5593e6b527899a5037a81a8c407d688a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xee32e7bdd2118a15aa8409508eea6dd6132ec8bdab56a4184ad80b7db4332a0d",
+        "lastblockhash" : "0xe396236dad8b520f841f4aaec6ca860af4bc9a76ee5a2e2a0da5d6d802ae1862",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -573,147 +289,5 @@
                 }
             }
         }
-    },
-    "callcallcodecall_010_SuicideMiddle_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/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "3c0c5f2280fd18238f4335974319553000343be6915d4b283fc86253b0e94cb6"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x9114",
-                    "hash" : "0x5d87d21a8eb770ba1b2191ac33a15b922cd7f9ffac8115c932b264184c86e595",
-                    "mixHash" : "0xc7dc770f0c4a26151f87736bbebba188114aff859c16822254617668b5333cd0",
-                    "nonce" : "0x2dc47a4413911211",
-                    "number" : "0x01",
-                    "parentHash" : "0x5465075aad678244c26edf5218d493fba7edf96d43d4de8610002d32db45d30e",
-                    "receiptTrie" : "0xf900ee8d38594f4eb3a21576ffa373f9ea170c133550f13d2abd6cfd46a535c4",
-                    "stateRoot" : "0x62fd9d31eb516a351a0f3ab1a672967759c0965479b6f620fbd67a7e15af217f",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a05465075aad678244c26edf5218d493fba7edf96d43d4de8610002d32db45d30ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa062fd9d31eb516a351a0f3ab1a672967759c0965479b6f620fbd67a7e15af217fa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f900ee8d38594f4eb3a21576ffa373f9ea170c133550f13d2abd6cfd46a535c4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291148203e880a0c7dc770f0c4a26151f87736bbebba188114aff859c16822254617668b5333cd0882dc47a4413911211f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x5465075aad678244c26edf5218d493fba7edf96d43d4de8610002d32db45d30e",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x492165c97da9a9b0761d44646fe4e4e3f5593e6b527899a5037a81a8c407d688",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0492165c97da9a9b0761d44646fe4e4e3f5593e6b527899a5037a81a8c407d688a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5d87d21a8eb770ba1b2191ac33a15b922cd7f9ffac8115c932b264184c86e595",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49114",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7636eec",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_d0g0v0.json
index c7b9f47bb..4ec64b962 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcodecall_010_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_d0g0v0Filler.json",
-            "sourceHash" : "b49125493fb61be6ed1ebda974fed9dde1da5ef7b5d9f35a60043aed73b041d1"
+            "sourceHash" : "e77caac824cc3d75fba98381233fc0e83f416481e793a4b8474f763221744c65"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x043899",
-                    "hash" : "0xd7652b3feff9099aac6c9e39348350b9e428f808039179916bf586e07a1b355f",
-                    "mixHash" : "0x029b84172667784606b659232c945fb531b481fd5b1f9af02ecc94de4f925524",
-                    "nonce" : "0x5c162362c4d29a4f",
+                    "hash" : "0xf07270f789e8252faa877dfdc94b6f564b09f20c5b1386d1ba27cb1570ea91b9",
+                    "mixHash" : "0x5f779e6b3e402fadbc56947c6a026783c379304340d782fac9c81c44231d61ff",
+                    "nonce" : "0x9377d9fee536dc4c",
                     "number" : "0x01",
                     "parentHash" : "0xd012980aa86480a9fd2a6b9be4de96774b02eef3cf1f3b10a524ce7d7a2a89ef",
                     "receiptTrie" : "0x788046ab48f832ce7c28bcf83134cae2f19a8f70ccb47def42b687bfc50ccdbc",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0d012980aa86480a9fd2a6b9be4de96774b02eef3cf1f3b10a524ce7d7a2a89efa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad473b05392f4053309824e0a9349e66c8f44f883b95ce4196ef16f51a13dc43a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0788046ab48f832ce7c28bcf83134cae2f19a8f70ccb47def42b687bfc50ccdbcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830438998203e880a0029b84172667784606b659232c945fb531b481fd5b1f9af02ecc94de4f925524885c162362c4d29a4ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0d012980aa86480a9fd2a6b9be4de96774b02eef3cf1f3b10a524ce7d7a2a89efa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ad473b05392f4053309824e0a9349e66c8f44f883b95ce4196ef16f51a13dc43a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0788046ab48f832ce7c28bcf83134cae2f19a8f70ccb47def42b687bfc50ccdbcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830438998203e880a05f779e6b3e402fadbc56947c6a026783c379304340d782fac9c81c44231d61ff889377d9fee536dc4cf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b40b02d8592e692c28af206146e54d3d087fb9ad8f65054d73705adea643380aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd7652b3feff9099aac6c9e39348350b9e428f808039179916bf586e07a1b355f",
+        "lastblockhash" : "0xf07270f789e8252faa877dfdc94b6f564b09f20c5b1386d1ba27cb1570ea91b9",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -160,335 +160,13 @@
             }
         }
     },
-    "callcallcodecall_010_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_d0g0v0Filler.json",
-            "sourceHash" : "b49125493fb61be6ed1ebda974fed9dde1da5ef7b5d9f35a60043aed73b041d1"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x043899",
-                    "hash" : "0x79f6a79d8eb86005e7eeeead3eefe524454a729708a74eb93a1cd24434ebd25d",
-                    "mixHash" : "0x737b3408878245b72bc0d8af20cc7015fca0879271037771dfd42a456624edec",
-                    "nonce" : "0x37d7a42c369e53e3",
-                    "number" : "0x01",
-                    "parentHash" : "0xd012980aa86480a9fd2a6b9be4de96774b02eef3cf1f3b10a524ce7d7a2a89ef",
-                    "receiptTrie" : "0x068a6eb7349caf11cdf85fbf95098f6093e4ab040b7c8c79b71f4bbcaf58b8b0",
-                    "stateRoot" : "0xf8ac72e19f1bfd37da45e82a59d48c23a50dc40f735f5f752597a58a1777c338",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0d012980aa86480a9fd2a6b9be4de96774b02eef3cf1f3b10a524ce7d7a2a89efa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8ac72e19f1bfd37da45e82a59d48c23a50dc40f735f5f752597a58a1777c338a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0068a6eb7349caf11cdf85fbf95098f6093e4ab040b7c8c79b71f4bbcaf58b8b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830438998203e880a0737b3408878245b72bc0d8af20cc7015fca0879271037771dfd42a456624edec8837d7a42c369e53e3f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xd012980aa86480a9fd2a6b9be4de96774b02eef3cf1f3b10a524ce7d7a2a89ef",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb40b02d8592e692c28af206146e54d3d087fb9ad8f65054d73705adea643380a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b40b02d8592e692c28af206146e54d3d087fb9ad8f65054d73705adea643380aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x79f6a79d8eb86005e7eeeead3eefe524454a729708a74eb93a1cd24434ebd25d",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x014a" : "0x1000000000000000000000000000000000000000",
-                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x0150" : "0x40",
-                    "0x0152" : "0x26",
-                    "0x0154" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01",
-                    "0x04" : "0x1000000000000000000000000000000000000000",
-                    "0x05" : "0x1000000000000000000000000000000000000000",
-                    "0x06" : "0x02"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060027310000000000000000000000000000000000000036203d090f260025533600555",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346006553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f83899",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75fc767",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060027310000000000000000000000000000000000000036203d090f260025533600555",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346006553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcallcodecall_010_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/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_d0g0v0Filler.json",
-            "sourceHash" : "b49125493fb61be6ed1ebda974fed9dde1da5ef7b5d9f35a60043aed73b041d1"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x043899",
-                    "hash" : "0x09db610014c7bbdf48bf2d4f5a69fde5e9102c4522db2342645b02cfd43264b6",
-                    "mixHash" : "0xde8d0545f4197dc3bbae52cb1dc8b5d6eeae665bcafdd4a5f690d1f19db3803a",
-                    "nonce" : "0x816258d6fe7ece99",
-                    "number" : "0x01",
-                    "parentHash" : "0xd012980aa86480a9fd2a6b9be4de96774b02eef3cf1f3b10a524ce7d7a2a89ef",
-                    "receiptTrie" : "0x068a6eb7349caf11cdf85fbf95098f6093e4ab040b7c8c79b71f4bbcaf58b8b0",
-                    "stateRoot" : "0xf8ac72e19f1bfd37da45e82a59d48c23a50dc40f735f5f752597a58a1777c338",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0d012980aa86480a9fd2a6b9be4de96774b02eef3cf1f3b10a524ce7d7a2a89efa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f8ac72e19f1bfd37da45e82a59d48c23a50dc40f735f5f752597a58a1777c338a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0068a6eb7349caf11cdf85fbf95098f6093e4ab040b7c8c79b71f4bbcaf58b8b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830438998203e880a0de8d0545f4197dc3bbae52cb1dc8b5d6eeae665bcafdd4a5f690d1f19db3803a88816258d6fe7ece99f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xd012980aa86480a9fd2a6b9be4de96774b02eef3cf1f3b10a524ce7d7a2a89ef",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb40b02d8592e692c28af206146e54d3d087fb9ad8f65054d73705adea643380a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b40b02d8592e692c28af206146e54d3d087fb9ad8f65054d73705adea643380aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x09db610014c7bbdf48bf2d4f5a69fde5e9102c4522db2342645b02cfd43264b6",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x014a" : "0x1000000000000000000000000000000000000000",
-                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x0150" : "0x40",
-                    "0x0152" : "0x26",
-                    "0x0154" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01",
-                    "0x04" : "0x1000000000000000000000000000000000000000",
-                    "0x05" : "0x1000000000000000000000000000000000000000",
-                    "0x06" : "0x02"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060027310000000000000000000000000000000000000036203d090f260025533600555",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346006553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f83899",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75fc767",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060027310000000000000000000000000000000000000036203d090f260025533600555",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346006553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcallcodecall_010_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_d0g0v0Filler.json",
-            "sourceHash" : "b49125493fb61be6ed1ebda974fed9dde1da5ef7b5d9f35a60043aed73b041d1"
+            "sourceHash" : "e77caac824cc3d75fba98381233fc0e83f416481e793a4b8474f763221744c65"
         },
         "blocks" : [
             {
@@ -499,9 +177,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x05e02e",
-                    "hash" : "0xbdde4159947c4788073035da02871654fa45bc32c61c9ed1e1b533da0ee33fdc",
-                    "mixHash" : "0x41dcff2353d2bbd210e1bdb71a2a78b38c94997e05d9ad4ace77f88081ca9fca",
-                    "nonce" : "0x083f29e1a2751972",
+                    "hash" : "0x2e4eaf267a6794a0e1352781c55d20a2e57edf34f18ed8e137cd6b54ac0bd10e",
+                    "mixHash" : "0x4ea1f1a7d736fe9390f3a3d26eab7fe6931ced713e771366882c150b1cd7fd92",
+                    "nonce" : "0xc656e7deb7f3f4f3",
                     "number" : "0x01",
                     "parentHash" : "0xd012980aa86480a9fd2a6b9be4de96774b02eef3cf1f3b10a524ce7d7a2a89ef",
                     "receiptTrie" : "0xb5eb36fc57969701e3c36bc32129a906161d3e8b5ad5f793eb1985404b6a3373",
@@ -510,10 +188,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0d012980aa86480a9fd2a6b9be4de96774b02eef3cf1f3b10a524ce7d7a2a89efa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d507d3fbc32ee47f5546f4bf9b037ff98c507eee4ea4da8a204d58841529e6ba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0b5eb36fc57969701e3c36bc32129a906161d3e8b5ad5f793eb1985404b6a3373b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808305e02e8203e880a041dcff2353d2bbd210e1bdb71a2a78b38c94997e05d9ad4ace77f88081ca9fca88083f29e1a2751972f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0d012980aa86480a9fd2a6b9be4de96774b02eef3cf1f3b10a524ce7d7a2a89efa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06d507d3fbc32ee47f5546f4bf9b037ff98c507eee4ea4da8a204d58841529e6ba05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0b5eb36fc57969701e3c36bc32129a906161d3e8b5ad5f793eb1985404b6a3373b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808305e02e8203e880a04ea1f1a7d736fe9390f3a3d26eab7fe6931ced713e771366882c150b1cd7fd9288c656e7deb7f3f4f3f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -547,7 +225,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b40b02d8592e692c28af206146e54d3d087fb9ad8f65054d73705adea643380aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbdde4159947c4788073035da02871654fa45bc32c61c9ed1e1b533da0ee33fdc",
+        "lastblockhash" : "0x2e4eaf267a6794a0e1352781c55d20a2e57edf34f18ed8e137cd6b54ac0bd10e",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -630,166 +308,5 @@
                 }
             }
         }
-    },
-    "callcallcodecall_010_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/stCallDelegateCodesCallCodeHomestead/callcallcodecall_010_d0g0v0Filler.json",
-            "sourceHash" : "b49125493fb61be6ed1ebda974fed9dde1da5ef7b5d9f35a60043aed73b041d1"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0430dd",
-                    "hash" : "0x035862643a995dbfd94d1e84f07ae9f7e243a7eebabd673dc96a855ecc49e30c",
-                    "mixHash" : "0x2e5b9d6f81746adb5f7a24544074cd865fde205782b5e82c46518fd3d79dcd7a",
-                    "nonce" : "0xd4e12ce4e6028e72",
-                    "number" : "0x01",
-                    "parentHash" : "0xd012980aa86480a9fd2a6b9be4de96774b02eef3cf1f3b10a524ce7d7a2a89ef",
-                    "receiptTrie" : "0x027dd209235d982ca4597e4f46725accc7f4c441d40dc794fbede7028e77911a",
-                    "stateRoot" : "0x16a622a773a9bc607ab98d95cd55749f81884b5dc1dd67b23ace2242b4bc15c7",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0d012980aa86480a9fd2a6b9be4de96774b02eef3cf1f3b10a524ce7d7a2a89efa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016a622a773a9bc607ab98d95cd55749f81884b5dc1dd67b23ace2242b4bc15c7a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0027dd209235d982ca4597e4f46725accc7f4c441d40dc794fbede7028e77911ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830430dd8203e880a02e5b9d6f81746adb5f7a24544074cd865fde205782b5e82c46518fd3d79dcd7a88d4e12ce4e6028e72f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xd012980aa86480a9fd2a6b9be4de96774b02eef3cf1f3b10a524ce7d7a2a89ef",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb40b02d8592e692c28af206146e54d3d087fb9ad8f65054d73705adea643380a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b40b02d8592e692c28af206146e54d3d087fb9ad8f65054d73705adea643380aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x035862643a995dbfd94d1e84f07ae9f7e243a7eebabd673dc96a855ecc49e30c",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x014a" : "0x1000000000000000000000000000000000000000",
-                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x0150" : "0x40",
-                    "0x0152" : "0x26",
-                    "0x0154" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01",
-                    "0x04" : "0x1000000000000000000000000000000000000000",
-                    "0x05" : "0x1000000000000000000000000000000000000000",
-                    "0x06" : "0x02"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060027310000000000000000000000000000000000000036203d090f260025533600555",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346006553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f830dd",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75fcf23",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060027310000000000000000000000000000000000000036203d090f260025533600555",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346006553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVE_d0g0v0.json
index 9de632c4f..72879ae44 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVE_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcodecall_ABCB_RECURSIVE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "d3d6c7fa50a31d8bb9c9a2585868ddb656bcb127ef91ef8ccfc7b87dc520bfb1"
+            "sourceHash" : "2af2293f363d6b31adbda8bdc66e926f1a9edee6b9af5e82c4971eca559ad954"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7b",
-                    "hash" : "0xda97506c245f0476f3931fa7b9a8e78e1af3e5f8ad4caeec828fdc5d243796cf",
-                    "mixHash" : "0xc8f6127df769afb6760fffb1c8ddcb667de0d5ed5845efd383b629e66f716deb",
-                    "nonce" : "0x88015a223a29b639",
+                    "hash" : "0xb0d4544b8ca4672adae369ac847ca776bfd29238509f440335b8be1eef18a398",
+                    "mixHash" : "0x1f2d1796325d318a589eec7142e5d8963bf08b05bb5649008396bf56005b779b",
+                    "nonce" : "0x9d765c5955695c65",
                     "number" : "0x01",
                     "parentHash" : "0x3be4f718b27fc8abdb9d57cfb0c25ba0186a2717200aa15ba1fc63dcf2f079b8",
                     "receiptTrie" : "0x63a01b86e4342726a564a98d55dac51745ef3a32d1a9d5515f4a6e0762a84fa3",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a03be4f718b27fc8abdb9d57cfb0c25ba0186a2717200aa15ba1fc63dcf2f079b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc8ee90bfd6f41f53aebc1e724f9acfe24565306745d9c948bc298b89dfbad87a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a063a01b86e4342726a564a98d55dac51745ef3a32d1a9d5515f4a6e0762a84fa3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7b8203e880a0c8f6127df769afb6760fffb1c8ddcb667de0d5ed5845efd383b629e66f716deb8888015a223a29b639f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a03be4f718b27fc8abdb9d57cfb0c25ba0186a2717200aa15ba1fc63dcf2f079b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc8ee90bfd6f41f53aebc1e724f9acfe24565306745d9c948bc298b89dfbad87a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a063a01b86e4342726a564a98d55dac51745ef3a32d1a9d5515f4a6e0762a84fa3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7b8203e880a01f2d1796325d318a589eec7142e5d8963bf08b05bb5649008396bf56005b779b889d765c5955695c65f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bfa2dbed7e5d111c0aade7576e25450143cda907bc1c5d254fa7f27a192086f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xda97506c245f0476f3931fa7b9a8e78e1af3e5f8ad4caeec828fdc5d243796cf",
+        "lastblockhash" : "0xb0d4544b8ca4672adae369ac847ca776bfd29238509f440335b8be1eef18a398",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -136,287 +136,13 @@
             }
         }
     },
-    "callcallcodecall_ABCB_RECURSIVE_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "d3d6c7fa50a31d8bb9c9a2585868ddb656bcb127ef91ef8ccfc7b87dc520bfb1"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08ab7b",
-                    "hash" : "0x38e4d821e41c45e096293ffab0624651bc6c8adf750ce7510e5ea9048732d03b",
-                    "mixHash" : "0x05671d558a624cf53aee56fe5c53600d2f1df09d39fac678a56d18c925d3675a",
-                    "nonce" : "0x699117df886af8b3",
-                    "number" : "0x01",
-                    "parentHash" : "0x3be4f718b27fc8abdb9d57cfb0c25ba0186a2717200aa15ba1fc63dcf2f079b8",
-                    "receiptTrie" : "0xee67f8f7bf1b90cf4fb75600627f3c178cd39738c40b51b4bb1f9be1dcde06e8",
-                    "stateRoot" : "0x5da75384359c9bd11a4ac86ceca997355e80ece827a4030be3e93932fd693f7a",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f9a03be4f718b27fc8abdb9d57cfb0c25ba0186a2717200aa15ba1fc63dcf2f079b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05da75384359c9bd11a4ac86ceca997355e80ece827a4030be3e93932fd693f7aa06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0ee67f8f7bf1b90cf4fb75600627f3c178cd39738c40b51b4bb1f9be1dcde06e8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7b8203e880a005671d558a624cf53aee56fe5c53600d2f1df09d39fac678a56d18c925d3675a88699117df886af8b3f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x01c9c380",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
-                        "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0xb2d05e00",
-            "gasUsed" : "0x00",
-            "hash" : "0x3be4f718b27fc8abdb9d57cfb0c25ba0186a2717200aa15ba1fc63dcf2f079b8",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xbfa2dbed7e5d111c0aade7576e25450143cda907bc1c5d254fa7f27a192086f2",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bfa2dbed7e5d111c0aade7576e25450143cda907bc1c5d254fa7f27a192086f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x38e4d821e41c45e096293ffab0624651bc6c8adf750ce7510e5ea9048732d03b",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620f4240f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fcab7b",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5485",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620f4240f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcallcodecall_ABCB_RECURSIVE_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/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "d3d6c7fa50a31d8bb9c9a2585868ddb656bcb127ef91ef8ccfc7b87dc520bfb1"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08ab7b",
-                    "hash" : "0x360fb7516b2d4381ce7d8e985e4720e02f8c78aec84e945f86560504e77b928a",
-                    "mixHash" : "0x79e96a3c0be2d8110abdba1217ae79ba0fe447b4f3043aedb69d7bf5bed6691b",
-                    "nonce" : "0x6cb742ecb55019ec",
-                    "number" : "0x01",
-                    "parentHash" : "0x3be4f718b27fc8abdb9d57cfb0c25ba0186a2717200aa15ba1fc63dcf2f079b8",
-                    "receiptTrie" : "0xee67f8f7bf1b90cf4fb75600627f3c178cd39738c40b51b4bb1f9be1dcde06e8",
-                    "stateRoot" : "0x5da75384359c9bd11a4ac86ceca997355e80ece827a4030be3e93932fd693f7a",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f9a03be4f718b27fc8abdb9d57cfb0c25ba0186a2717200aa15ba1fc63dcf2f079b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05da75384359c9bd11a4ac86ceca997355e80ece827a4030be3e93932fd693f7aa06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0ee67f8f7bf1b90cf4fb75600627f3c178cd39738c40b51b4bb1f9be1dcde06e8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7b8203e880a079e96a3c0be2d8110abdba1217ae79ba0fe447b4f3043aedb69d7bf5bed6691b886cb742ecb55019ecf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x01c9c380",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
-                        "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0xb2d05e00",
-            "gasUsed" : "0x00",
-            "hash" : "0x3be4f718b27fc8abdb9d57cfb0c25ba0186a2717200aa15ba1fc63dcf2f079b8",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xbfa2dbed7e5d111c0aade7576e25450143cda907bc1c5d254fa7f27a192086f2",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bfa2dbed7e5d111c0aade7576e25450143cda907bc1c5d254fa7f27a192086f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x360fb7516b2d4381ce7d8e985e4720e02f8c78aec84e945f86560504e77b928a",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620f4240f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fcab7b",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5485",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620f4240f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcallcodecall_ABCB_RECURSIVE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "d3d6c7fa50a31d8bb9c9a2585868ddb656bcb127ef91ef8ccfc7b87dc520bfb1"
+            "sourceHash" : "2af2293f363d6b31adbda8bdc66e926f1a9edee6b9af5e82c4971eca559ad954"
         },
         "blocks" : [
             {
@@ -427,9 +153,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x017dde16",
-                    "hash" : "0x941237b52fbf35f35df875fe18adf5a5d5b2e0701bd91601bdbf650698920680",
-                    "mixHash" : "0x89780475de2ee41998c9bf7cdcff23cd991273d671a65277615bec09e7baf72d",
-                    "nonce" : "0xe156ea5fd71417d3",
+                    "hash" : "0x4979e0116a809114f6f5d32aa94ee6f6da98df03bf328c4cf4c241f9bc302bf5",
+                    "mixHash" : "0x45e527d5a50b870f9bb4fa04c12ec5ca6ea7985427309fd3f1a3c6e05f1a4c36",
+                    "nonce" : "0xff2a8a9d8186fa65",
                     "number" : "0x01",
                     "parentHash" : "0x3be4f718b27fc8abdb9d57cfb0c25ba0186a2717200aa15ba1fc63dcf2f079b8",
                     "receiptTrie" : "0x5f83a22222b781d1b8549180de0f3f5dc715183202502cd2c4efbf7406e0074e",
@@ -438,10 +164,10 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa03be4f718b27fc8abdb9d57cfb0c25ba0186a2717200aa15ba1fc63dcf2f079b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c98b337320dadbc7d061ea53e3a5f28a95faaafa3db0f4a4f826840222210ecea06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a05f83a22222b781d1b8549180de0f3f5dc715183202502cd2c4efbf7406e0074eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e0084017dde168203e880a089780475de2ee41998c9bf7cdcff23cd991273d671a65277615bec09e7baf72d88e156ea5fd71417d3f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90263f901faa03be4f718b27fc8abdb9d57cfb0c25ba0186a2717200aa15ba1fc63dcf2f079b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c98b337320dadbc7d061ea53e3a5f28a95faaafa3db0f4a4f826840222210ecea06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a05f83a22222b781d1b8549180de0f3f5dc715183202502cd2c4efbf7406e0074eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e0084017dde168203e880a045e527d5a50b870f9bb4fa04c12ec5ca6ea7985427309fd3f1a3c6e05f1a4c3688ff2a8a9d8186fa65f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -475,7 +201,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bfa2dbed7e5d111c0aade7576e25450143cda907bc1c5d254fa7f27a192086f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x941237b52fbf35f35df875fe18adf5a5d5b2e0701bd91601bdbf650698920680",
+        "lastblockhash" : "0x4979e0116a809114f6f5d32aa94ee6f6da98df03bf328c4cf4c241f9bc302bf5",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -548,10 +274,10 @@
     "callcallcodecall_ABCB_RECURSIVE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "d3d6c7fa50a31d8bb9c9a2585868ddb656bcb127ef91ef8ccfc7b87dc520bfb1"
+            "sourceHash" : "2af2293f363d6b31adbda8bdc66e926f1a9edee6b9af5e82c4971eca559ad954"
         },
         "blocks" : [
             {
@@ -562,9 +288,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3bf",
-                    "hash" : "0x004760428127c32476d90ceb501a664faf2a18e89310219276255ef27d06302b",
-                    "mixHash" : "0xdd74d0a8d604637bdd601020db6c3f619c23d61f56ad9fd7872da3a5c87e7bc7",
-                    "nonce" : "0xc2d97bf4070acbb3",
+                    "hash" : "0x58feb953b0d272ce7b301d126eb3a241fffb756bdc3e4155c45f92354b450783",
+                    "mixHash" : "0x0bb54c419fa582b9eaed9e00202745d2192887cf9bbe3f58107bb0496f85f5c4",
+                    "nonce" : "0x31a84903689a6e57",
                     "number" : "0x01",
                     "parentHash" : "0x3be4f718b27fc8abdb9d57cfb0c25ba0186a2717200aa15ba1fc63dcf2f079b8",
                     "receiptTrie" : "0x840d0613133a3238c908e4b81446bd308d892c04aa776559ca6f24a78200424c",
@@ -573,10 +299,10 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a03be4f718b27fc8abdb9d57cfb0c25ba0186a2717200aa15ba1fc63dcf2f079b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c068bb306055a18579d61ad370b751d82dd070a088ea065a185653776fc85411a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0840d0613133a3238c908e4b81446bd308d892c04aa776559ca6f24a78200424cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3bf8203e880a0dd74d0a8d604637bdd601020db6c3f619c23d61f56ad9fd7872da3a5c87e7bc788c2d97bf4070acbb3f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a03be4f718b27fc8abdb9d57cfb0c25ba0186a2717200aa15ba1fc63dcf2f079b8a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c068bb306055a18579d61ad370b751d82dd070a088ea065a185653776fc85411a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0840d0613133a3238c908e4b81446bd308d892c04aa776559ca6f24a78200424cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3bf8203e880a00bb54c419fa582b9eaed9e00202745d2192887cf9bbe3f58107bb0496f85f5c48831a84903689a6e57f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -610,7 +336,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bfa2dbed7e5d111c0aade7576e25450143cda907bc1c5d254fa7f27a192086f2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x004760428127c32476d90ceb501a664faf2a18e89310219276255ef27d06302b",
+        "lastblockhash" : "0x58feb953b0d272ce7b301d126eb3a241fffb756bdc3e4155c45f92354b450783",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGE_d0g0v0.json
index a3d1620ca..d94b71225 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGE_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_OOGE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "50400577425e07976736febd474b0b4ec13b2ddc652e4a8eade4fc5a8dd90191"
+            "sourceHash" : "36e9bae25bc11906bad75b0b9f94563db8f3925724e2acb8879c6ad10aef9781"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x01588c",
-                    "hash" : "0x87454f96c2cc18eb9d857a636d64aab227a0b9904a7d077382446ef2d7077bd5",
-                    "mixHash" : "0x104639e4d980e45bb802467bcc8eba9ff26f31efd898fd227baaa12907729fc3",
-                    "nonce" : "0xbdbef6578d913fdb",
+                    "hash" : "0x20930f08efadbfb145fa842421befc359c9a24a5bb4a65d03bd42ce243c7afc7",
+                    "mixHash" : "0x740da30b5a5399c9ac2af8db96710d0f79c740955bafaf830e8b2ccf83012bff",
+                    "nonce" : "0x9bcd6e258ac04dd8",
                     "number" : "0x01",
                     "parentHash" : "0x72c0af6f57e8ccfa9d941f00929a0293eb89de4e6ffd1d7382732f339f6a0d02",
                     "receiptTrie" : "0xfb18c88fc1db8de08a7648b8ab27197ee3d05ab23924bce4196dc532701fa2cb",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a072c0af6f57e8ccfa9d941f00929a0293eb89de4e6ffd1d7382732f339f6a0d02a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0824592860e2eb73832ae99deab8ace3d11d8bcc15f748f94f6bd255fb3736595a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fb18c88fc1db8de08a7648b8ab27197ee3d05ab23924bce4196dc532701fa2cbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301588c8203e880a0104639e4d980e45bb802467bcc8eba9ff26f31efd898fd227baaa12907729fc388bdbef6578d913fdbf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a072c0af6f57e8ccfa9d941f00929a0293eb89de4e6ffd1d7382732f339f6a0d02a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0824592860e2eb73832ae99deab8ace3d11d8bcc15f748f94f6bd255fb3736595a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fb18c88fc1db8de08a7648b8ab27197ee3d05ab23924bce4196dc532701fa2cbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301588c8203e880a0740da30b5a5399c9ac2af8db96710d0f79c740955bafaf830e8b2ccf83012bff889bcd6e258ac04dd8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f954236e6113d78e059623462365f76d1f2053301a26406d442f0928b37f7646a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x87454f96c2cc18eb9d857a636d64aab227a0b9904a7d077382446ef2d7077bd5",
+        "lastblockhash" : "0x20930f08efadbfb145fa842421befc359c9a24a5bb4a65d03bd42ce243c7afc7",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -150,315 +150,13 @@
             }
         }
     },
-    "callcallcodecallcode_011_OOGE_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "50400577425e07976736febd474b0b4ec13b2ddc652e4a8eade4fc5a8dd90191"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x01588c",
-                    "hash" : "0x811be1bcb1934077deac9445a487b89721e1aa5c1a988a3ef254b406dd8affe0",
-                    "mixHash" : "0x372a8d7e21b908002e11072a49155ddd333d4d400983236a5be7d9332b11fc53",
-                    "nonce" : "0xcc32f3c2f58443c8",
-                    "number" : "0x01",
-                    "parentHash" : "0x72c0af6f57e8ccfa9d941f00929a0293eb89de4e6ffd1d7382732f339f6a0d02",
-                    "receiptTrie" : "0xb3ce0e84ee1187ac13734498077b96f3083b7e02bea81dbf3982abb4db3cd103",
-                    "stateRoot" : "0xd2c4999c739eb2bf3831ef77692f34bdb231d41599b9feb83fc14bd246d25e5b",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a072c0af6f57e8ccfa9d941f00929a0293eb89de4e6ffd1d7382732f339f6a0d02a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2c4999c739eb2bf3831ef77692f34bdb231d41599b9feb83fc14bd246d25e5ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0b3ce0e84ee1187ac13734498077b96f3083b7e02bea81dbf3982abb4db3cd103b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301588c8203e880a0372a8d7e21b908002e11072a49155ddd333d4d400983236a5be7d9332b11fc5388cc32f3c2f58443c8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x72c0af6f57e8ccfa9d941f00929a0293eb89de4e6ffd1d7382732f339f6a0d02",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf954236e6113d78e059623462365f76d1f2053301a26406d442f0928b37f7646",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f954236e6113d78e059623462365f76d1f2053301a26406d442f0928b37f7646a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x811be1bcb1934077deac9445a487b89721e1aa5c1a988a3ef254b406dd8affe0",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5588c",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762a774",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcallcodecallcode_011_OOGE_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/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "50400577425e07976736febd474b0b4ec13b2ddc652e4a8eade4fc5a8dd90191"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x01588c",
-                    "hash" : "0x305d08b78735c6181272077bafacb05cfa38e8ae2055e9daac82eb4a1f6d5e4e",
-                    "mixHash" : "0xc912963464ca09a7fcf9dabc752965ed0e8f8fd636451121f038ed884b395fec",
-                    "nonce" : "0x9d2444dcb731fb25",
-                    "number" : "0x01",
-                    "parentHash" : "0x72c0af6f57e8ccfa9d941f00929a0293eb89de4e6ffd1d7382732f339f6a0d02",
-                    "receiptTrie" : "0xb3ce0e84ee1187ac13734498077b96f3083b7e02bea81dbf3982abb4db3cd103",
-                    "stateRoot" : "0xd2c4999c739eb2bf3831ef77692f34bdb231d41599b9feb83fc14bd246d25e5b",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a072c0af6f57e8ccfa9d941f00929a0293eb89de4e6ffd1d7382732f339f6a0d02a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2c4999c739eb2bf3831ef77692f34bdb231d41599b9feb83fc14bd246d25e5ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0b3ce0e84ee1187ac13734498077b96f3083b7e02bea81dbf3982abb4db3cd103b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301588c8203e880a0c912963464ca09a7fcf9dabc752965ed0e8f8fd636451121f038ed884b395fec889d2444dcb731fb25f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x72c0af6f57e8ccfa9d941f00929a0293eb89de4e6ffd1d7382732f339f6a0d02",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf954236e6113d78e059623462365f76d1f2053301a26406d442f0928b37f7646",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f954236e6113d78e059623462365f76d1f2053301a26406d442f0928b37f7646a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x305d08b78735c6181272077bafacb05cfa38e8ae2055e9daac82eb4a1f6d5e4e",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5588c",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762a774",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcallcodecallcode_011_OOGE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "50400577425e07976736febd474b0b4ec13b2ddc652e4a8eade4fc5a8dd90191"
+            "sourceHash" : "36e9bae25bc11906bad75b0b9f94563db8f3925724e2acb8879c6ad10aef9781"
         },
         "blocks" : [
             {
@@ -469,9 +167,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "0x94f58f4a93264399808b4821bb4eed08f687c1a161d08bdab12686cf3100b89f",
-                    "mixHash" : "0x541c0d59a4c5e77e8ee8a15ba9ab2374a53f374789328836f49fe86a3a9cd7ea",
-                    "nonce" : "0x8cbbf09ae0e850d8",
+                    "hash" : "0x5ba7d8d8f7a87fa905708d104fdf349407979f64c5206f435a7729d4859c19d6",
+                    "mixHash" : "0xfc4f3d446c63cf78cc9662b74befdf70c7335bd343a8362a6767e575a51230e9",
+                    "nonce" : "0x8e2048a5741185b7",
                     "number" : "0x01",
                     "parentHash" : "0x72c0af6f57e8ccfa9d941f00929a0293eb89de4e6ffd1d7382732f339f6a0d02",
                     "receiptTrie" : "0xa00fc93a92de0d547ce8aab58628053c4b1f7a5dd8f2bd68c76cf89bec8c4562",
@@ -480,10 +178,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a072c0af6f57e8ccfa9d941f00929a0293eb89de4e6ffd1d7382732f339f6a0d02a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c7d189665dfe83e74623fa713d7f07f8787737a78b0b405305f7cdbcab1f2c3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a00fc93a92de0d547ce8aab58628053c4b1f7a5dd8f2bd68c76cf89bec8c4562b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0541c0d59a4c5e77e8ee8a15ba9ab2374a53f374789328836f49fe86a3a9cd7ea888cbbf09ae0e850d8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a072c0af6f57e8ccfa9d941f00929a0293eb89de4e6ffd1d7382732f339f6a0d02a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c7d189665dfe83e74623fa713d7f07f8787737a78b0b405305f7cdbcab1f2c3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a00fc93a92de0d547ce8aab58628053c4b1f7a5dd8f2bd68c76cf89bec8c4562b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0fc4f3d446c63cf78cc9662b74befdf70c7335bd343a8362a6767e575a51230e9888e2048a5741185b7f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -517,7 +215,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f954236e6113d78e059623462365f76d1f2053301a26406d442f0928b37f7646a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x94f58f4a93264399808b4821bb4eed08f687c1a161d08bdab12686cf3100b89f",
+        "lastblockhash" : "0x5ba7d8d8f7a87fa905708d104fdf349407979f64c5206f435a7729d4859c19d6",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -600,156 +298,5 @@
                 }
             }
         }
-    },
-    "callcallcodecallcode_011_OOGE_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/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "50400577425e07976736febd474b0b4ec13b2ddc652e4a8eade4fc5a8dd90191"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150d0",
-                    "hash" : "0x7ef9522a7c7170e4f0561c43dead5e58120ac81f2cfb0ba92114e7d576b10a3e",
-                    "mixHash" : "0x15aa4c50dd2aebd5be1d6dbb32f2c52d3099e1e5ded71047f1aed654eb8a578f",
-                    "nonce" : "0xab91c7e014c9294d",
-                    "number" : "0x01",
-                    "parentHash" : "0x72c0af6f57e8ccfa9d941f00929a0293eb89de4e6ffd1d7382732f339f6a0d02",
-                    "receiptTrie" : "0xb7b630fdd2f5518aac5d4df241ee491e4c7a64d0472f31d4766c590d4fb9a31d",
-                    "stateRoot" : "0x4d9bab04f49b85f170262bcd36ce4872735b7cef39979f7ec631bb52b0ab2908",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a072c0af6f57e8ccfa9d941f00929a0293eb89de4e6ffd1d7382732f339f6a0d02a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04d9bab04f49b85f170262bcd36ce4872735b7cef39979f7ec631bb52b0ab2908a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0b7b630fdd2f5518aac5d4df241ee491e4c7a64d0472f31d4766c590d4fb9a31db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d08203e880a015aa4c50dd2aebd5be1d6dbb32f2c52d3099e1e5ded71047f1aed654eb8a578f88ab91c7e014c9294df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x72c0af6f57e8ccfa9d941f00929a0293eb89de4e6ffd1d7382732f339f6a0d02",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf954236e6113d78e059623462365f76d1f2053301a26406d442f0928b37f7646",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f954236e6113d78e059623462365f76d1f2053301a26406d442f0928b37f7646a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7ef9522a7c7170e4f0561c43dead5e58120ac81f2cfb0ba92114e7d576b10a3e",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550d0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af30",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfter_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfter_d0g0v0.json
index e5d295229..3214892f1 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfter_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfter_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "e0952c653cd9d020e126d4a2270ce3972d8d5564c5d5177c4a35692ff956b334"
+            "sourceHash" : "fe58604b981a39ef2133c7a0ae853037b5f31e8e988b920b51cf1db5e2175df7"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x01535b",
-                    "hash" : "0x2f8cea47227ccec648094a0275e82f5890b694c80e9335feadaf37d91a633864",
-                    "mixHash" : "0xbd918df7494c34c07f23cf0c949184e8e7fadb3df5b6469ee981bf32863661fe",
-                    "nonce" : "0xf8cb6352fe13ef70",
+                    "hash" : "0xb35319e43d74915ba048f438669034e3009ea95fe5e8e7259e47fb6c9d006727",
+                    "mixHash" : "0x5db4a30760aa38f283df4c35b40200eb4f39c57592c822b8d582f1499eae47c6",
+                    "nonce" : "0x1218541204f6246f",
                     "number" : "0x01",
                     "parentHash" : "0xebf33a368b7fcc32b95e0369b5121178c747eb11d18fe11ac099fca6d8281fa2",
                     "receiptTrie" : "0xbe9e45dcfe765ea5f66895a3f4f538ccd3d72e489fbfc06601e79751f330a2b3",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ebf33a368b7fcc32b95e0369b5121178c747eb11d18fe11ac099fca6d8281fa2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa022e820ee7c935bce8552d8bd29d381a98ab38b1e046f1f3a0e9e8163408de2dda0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0be9e45dcfe765ea5f66895a3f4f538ccd3d72e489fbfc06601e79751f330a2b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301535b8203e880a0bd918df7494c34c07f23cf0c949184e8e7fadb3df5b6469ee981bf32863661fe88f8cb6352fe13ef70f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0ebf33a368b7fcc32b95e0369b5121178c747eb11d18fe11ac099fca6d8281fa2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa022e820ee7c935bce8552d8bd29d381a98ab38b1e046f1f3a0e9e8163408de2dda0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0be9e45dcfe765ea5f66895a3f4f538ccd3d72e489fbfc06601e79751f330a2b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301535b8203e880a05db4a30760aa38f283df4c35b40200eb4f39c57592c822b8d582f1499eae47c6881218541204f6246ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0666bd3a3861792f6e191b67d70c7cc1cc4c282c44afc617b1d55d82899c220d0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2f8cea47227ccec648094a0275e82f5890b694c80e9335feadaf37d91a633864",
+        "lastblockhash" : "0xb35319e43d74915ba048f438669034e3009ea95fe5e8e7259e47fb6c9d006727",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -148,311 +148,13 @@
             }
         }
     },
-    "callcallcodecallcode_011_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "e0952c653cd9d020e126d4a2270ce3972d8d5564c5d5177c4a35692ff956b334"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x01535b",
-                    "hash" : "0x47051f271583f0eff4ddc6c6fd18b4df989c3dae2e3cd1738340697c5eeece89",
-                    "mixHash" : "0xf0958e0f5a37b76f809bbaa1151735c7a7c9c558f66838efe43bc4bba9cf39a2",
-                    "nonce" : "0xa7cb6782a6bd92f1",
-                    "number" : "0x01",
-                    "parentHash" : "0xebf33a368b7fcc32b95e0369b5121178c747eb11d18fe11ac099fca6d8281fa2",
-                    "receiptTrie" : "0x5d0d2b55cefb94f599a82583022d290eb6760fcfdc44ea5b1680b7aed8eeaf89",
-                    "stateRoot" : "0x87e42f4b83e91cb8480b559e873113040c685fe57c45906573f66d37418d10c5",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0ebf33a368b7fcc32b95e0369b5121178c747eb11d18fe11ac099fca6d8281fa2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa087e42f4b83e91cb8480b559e873113040c685fe57c45906573f66d37418d10c5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05d0d2b55cefb94f599a82583022d290eb6760fcfdc44ea5b1680b7aed8eeaf89b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301535b8203e880a0f0958e0f5a37b76f809bbaa1151735c7a7c9c558f66838efe43bc4bba9cf39a288a7cb6782a6bd92f1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xebf33a368b7fcc32b95e0369b5121178c747eb11d18fe11ac099fca6d8281fa2",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x666bd3a3861792f6e191b67d70c7cc1cc4c282c44afc617b1d55d82899c220d0",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0666bd3a3861792f6e191b67d70c7cc1cc4c282c44afc617b1d55d82899c220d0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x47051f271583f0eff4ddc6c6fd18b4df989c3dae2e3cd1738340697c5eeece89",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf1f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000261c350f46001556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5535b",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aca5",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf1f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000261c350f46001556001600352",
-                "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_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/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "e0952c653cd9d020e126d4a2270ce3972d8d5564c5d5177c4a35692ff956b334"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x01535b",
-                    "hash" : "0x2fa275c617fad1733265a2b3e5ce22f6f463b33865e991ad2b55d17a523573e0",
-                    "mixHash" : "0xa4b7cdbe058d4803bdd6a990f8f6f4c021df84ad62424e71be355cf59ae05e67",
-                    "nonce" : "0xfad430b569d7b046",
-                    "number" : "0x01",
-                    "parentHash" : "0xebf33a368b7fcc32b95e0369b5121178c747eb11d18fe11ac099fca6d8281fa2",
-                    "receiptTrie" : "0x5d0d2b55cefb94f599a82583022d290eb6760fcfdc44ea5b1680b7aed8eeaf89",
-                    "stateRoot" : "0x87e42f4b83e91cb8480b559e873113040c685fe57c45906573f66d37418d10c5",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0ebf33a368b7fcc32b95e0369b5121178c747eb11d18fe11ac099fca6d8281fa2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa087e42f4b83e91cb8480b559e873113040c685fe57c45906573f66d37418d10c5a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05d0d2b55cefb94f599a82583022d290eb6760fcfdc44ea5b1680b7aed8eeaf89b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301535b8203e880a0a4b7cdbe058d4803bdd6a990f8f6f4c021df84ad62424e71be355cf59ae05e6788fad430b569d7b046f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xebf33a368b7fcc32b95e0369b5121178c747eb11d18fe11ac099fca6d8281fa2",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x666bd3a3861792f6e191b67d70c7cc1cc4c282c44afc617b1d55d82899c220d0",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0666bd3a3861792f6e191b67d70c7cc1cc4c282c44afc617b1d55d82899c220d0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2fa275c617fad1733265a2b3e5ce22f6f463b33865e991ad2b55d17a523573e0",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf1f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000261c350f46001556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5535b",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aca5",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf1f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000261c350f46001556001600352",
-                "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_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "e0952c653cd9d020e126d4a2270ce3972d8d5564c5d5177c4a35692ff956b334"
+            "sourceHash" : "fe58604b981a39ef2133c7a0ae853037b5f31e8e988b920b51cf1db5e2175df7"
         },
         "blocks" : [
             {
@@ -463,9 +165,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150c7",
-                    "hash" : "0xbfd14db5ce014f35576df2230ee782898ce3f304f8789e57a9c4f94c79fc6989",
-                    "mixHash" : "0x4b95410fa868c7808d9f8a4767012f3a05ddf3f2a923ff6620f5b078c0c1885d",
-                    "nonce" : "0xea1c5a268b800405",
+                    "hash" : "0xd578e8fb23d6d16a5c1bb26f366bb7fec7ce30370e3e38df640407d6af5798ab",
+                    "mixHash" : "0x2a570d1bd94278d75bb0a9e8a6e1345e3117ba4b3339f7b7c2e3b293e869694f",
+                    "nonce" : "0x7d61e72d32cdb33f",
                     "number" : "0x01",
                     "parentHash" : "0xebf33a368b7fcc32b95e0369b5121178c747eb11d18fe11ac099fca6d8281fa2",
                     "receiptTrie" : "0x0d331cf18b5604836ba86c9fea671760539a2dd9d441cacbe34ef866b381a30e",
@@ -474,10 +176,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0ebf33a368b7fcc32b95e0369b5121178c747eb11d18fe11ac099fca6d8281fa2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02fd4e4376149c22fb1ac7d71ffc41c6e43f54e3d9af6f830d30ec05f91b3353ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00d331cf18b5604836ba86c9fea671760539a2dd9d441cacbe34ef866b381a30eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150c78203e880a04b95410fa868c7808d9f8a4767012f3a05ddf3f2a923ff6620f5b078c0c1885d88ea1c5a268b800405f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0ebf33a368b7fcc32b95e0369b5121178c747eb11d18fe11ac099fca6d8281fa2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02fd4e4376149c22fb1ac7d71ffc41c6e43f54e3d9af6f830d30ec05f91b3353ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00d331cf18b5604836ba86c9fea671760539a2dd9d441cacbe34ef866b381a30eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150c78203e880a02a570d1bd94278d75bb0a9e8a6e1345e3117ba4b3339f7b7c2e3b293e869694f887d61e72d32cdb33ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -511,7 +213,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0666bd3a3861792f6e191b67d70c7cc1cc4c282c44afc617b1d55d82899c220d0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbfd14db5ce014f35576df2230ee782898ce3f304f8789e57a9c4f94c79fc6989",
+        "lastblockhash" : "0xd578e8fb23d6d16a5c1bb26f366bb7fec7ce30370e3e38df640407d6af5798ab",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -594,154 +296,5 @@
                 }
             }
         }
-    },
-    "callcallcodecallcode_011_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "e0952c653cd9d020e126d4a2270ce3972d8d5564c5d5177c4a35692ff956b334"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150c7",
-                    "hash" : "0x48ca94602ae4f9da4f7f1cafc75334ef7d29e9e19c8a726a3f7085b82871ac6a",
-                    "mixHash" : "0x4fc8db0f9a3363b208d94f2579a805c8f04fd2a5d82e9fff9fb84369c2d08f8b",
-                    "nonce" : "0xd9c602eab1a12fe6",
-                    "number" : "0x01",
-                    "parentHash" : "0xebf33a368b7fcc32b95e0369b5121178c747eb11d18fe11ac099fca6d8281fa2",
-                    "receiptTrie" : "0x0d331cf18b5604836ba86c9fea671760539a2dd9d441cacbe34ef866b381a30e",
-                    "stateRoot" : "0x2fd4e4376149c22fb1ac7d71ffc41c6e43f54e3d9af6f830d30ec05f91b3353e",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0ebf33a368b7fcc32b95e0369b5121178c747eb11d18fe11ac099fca6d8281fa2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02fd4e4376149c22fb1ac7d71ffc41c6e43f54e3d9af6f830d30ec05f91b3353ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00d331cf18b5604836ba86c9fea671760539a2dd9d441cacbe34ef866b381a30eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150c78203e880a04fc8db0f9a3363b208d94f2579a805c8f04fd2a5d82e9fff9fb84369c2d08f8b88d9c602eab1a12fe6f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xebf33a368b7fcc32b95e0369b5121178c747eb11d18fe11ac099fca6d8281fa2",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x666bd3a3861792f6e191b67d70c7cc1cc4c282c44afc617b1d55d82899c220d0",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0666bd3a3861792f6e191b67d70c7cc1cc4c282c44afc617b1d55d82899c220d0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x48ca94602ae4f9da4f7f1cafc75334ef7d29e9e19c8a726a3f7085b82871ac6a",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf1f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000261c350f46001556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550c7",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af39",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000161eaf1f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000261c350f46001556001600352",
-                "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" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBefore_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBefore_d0g0v0.json
index 80237c162..fc7d7b0eb 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBefore_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBefore_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_OOGMBefore_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "d9a72b130c0ad5a486fe75459442b9223c399b00e375b43e66f1ddd29ab778cb"
+            "sourceHash" : "598bb467375235154359267976910ec76464d2bbdabbab4de73a72a20ee67db2"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f1",
-                    "hash" : "0x8c4706c5456fde2498b537075cddcce7ba6bb0e70e816891058b1de483c1d335",
-                    "mixHash" : "0x6cc429f627fb07c005976c2f02b5fc312e7ff5d8b6b391de818b409b1e530a06",
-                    "nonce" : "0x72ee3b30374d6cc9",
+                    "hash" : "0xbf7215e13fa9030529c287681de8a78e5ce1e1b7df11fe709a9a0b5062f2cd66",
+                    "mixHash" : "0x379451aaad8288469eda5976fd4025bc8d3ca58a6181112804ee3713e8ef12bb",
+                    "nonce" : "0x01eeb4382107f43b",
                     "number" : "0x01",
                     "parentHash" : "0xeda05ff2d11bdc46c9c11794c97ec54f7d1cb45a113822e7904edd05a49d899e",
                     "receiptTrie" : "0x577da455939dbfab0531e9b7f91c9084d2faeaf47e5372ecf6e9f1d584298fcf",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0eda05ff2d11bdc46c9c11794c97ec54f7d1cb45a113822e7904edd05a49d899ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e0481b84db6438e83e0d3255f8840dcb633514c8831ebe721f10a3b96700b779a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0577da455939dbfab0531e9b7f91c9084d2faeaf47e5372ecf6e9f1d584298fcfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f18203e880a06cc429f627fb07c005976c2f02b5fc312e7ff5d8b6b391de818b409b1e530a068872ee3b30374d6cc9f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0eda05ff2d11bdc46c9c11794c97ec54f7d1cb45a113822e7904edd05a49d899ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e0481b84db6438e83e0d3255f8840dcb633514c8831ebe721f10a3b96700b779a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0577da455939dbfab0531e9b7f91c9084d2faeaf47e5372ecf6e9f1d584298fcfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f18203e880a0379451aaad8288469eda5976fd4025bc8d3ca58a6181112804ee3713e8ef12bb8801eeb4382107f43bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06433ac25b646de762c734180e12ca9542b20a4c93fa9f5156016533a0653d003a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8c4706c5456fde2498b537075cddcce7ba6bb0e70e816891058b1de483c1d335",
+        "lastblockhash" : "0xbf7215e13fa9030529c287681de8a78e5ce1e1b7df11fe709a9a0b5062f2cd66",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -149,313 +149,13 @@
             }
         }
     },
-    "callcallcodecallcode_011_OOGMBefore_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "d9a72b130c0ad5a486fe75459442b9223c399b00e375b43e66f1ddd29ab778cb"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155f1",
-                    "hash" : "0x6953629d4608d7e8e5702a7f5bb882b894abbf40b60fa7064a0d7eeb1095d38d",
-                    "mixHash" : "0x741a2ec3dd62c02373bced68a1d5fca431811a306e27ea043e63c78abb85d933",
-                    "nonce" : "0x16692a183402fe16",
-                    "number" : "0x01",
-                    "parentHash" : "0xeda05ff2d11bdc46c9c11794c97ec54f7d1cb45a113822e7904edd05a49d899e",
-                    "receiptTrie" : "0x906b3a7ff44a11caca78413218b31c96ec2bb2a123dc68b58edfb418ee88d7b0",
-                    "stateRoot" : "0x5298e401a38002dd078d77bccb4acde2f24eacd11f3fdf44b46dadced863d739",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0eda05ff2d11bdc46c9c11794c97ec54f7d1cb45a113822e7904edd05a49d899ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05298e401a38002dd078d77bccb4acde2f24eacd11f3fdf44b46dadced863d739a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0906b3a7ff44a11caca78413218b31c96ec2bb2a123dc68b58edfb418ee88d7b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f18203e880a0741a2ec3dd62c02373bced68a1d5fca431811a306e27ea043e63c78abb85d9338816692a183402fe16f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xeda05ff2d11bdc46c9c11794c97ec54f7d1cb45a113822e7904edd05a49d899e",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x6433ac25b646de762c734180e12ca9542b20a4c93fa9f5156016533a0653d003",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06433ac25b646de762c734180e12ca9542b20a4c93fa9f5156016533a0653d003a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6953629d4608d7e8e5702a7f5bb882b894abbf40b60fa7064a0d7eeb1095d38d",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555f1",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa0f",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcallcodecallcode_011_OOGMBefore_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/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "d9a72b130c0ad5a486fe75459442b9223c399b00e375b43e66f1ddd29ab778cb"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155f1",
-                    "hash" : "0x0de3d4351f2dc8a05d2cc1235e7cdfd0cceff7356cdc4215786406ef57f339dd",
-                    "mixHash" : "0xd99c6c90f3a686013153d7947c7faacd93fa259101ca0d2af4ac179c178e720c",
-                    "nonce" : "0x8bdfbb331e1b3eba",
-                    "number" : "0x01",
-                    "parentHash" : "0xeda05ff2d11bdc46c9c11794c97ec54f7d1cb45a113822e7904edd05a49d899e",
-                    "receiptTrie" : "0x906b3a7ff44a11caca78413218b31c96ec2bb2a123dc68b58edfb418ee88d7b0",
-                    "stateRoot" : "0x5298e401a38002dd078d77bccb4acde2f24eacd11f3fdf44b46dadced863d739",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0eda05ff2d11bdc46c9c11794c97ec54f7d1cb45a113822e7904edd05a49d899ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05298e401a38002dd078d77bccb4acde2f24eacd11f3fdf44b46dadced863d739a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0906b3a7ff44a11caca78413218b31c96ec2bb2a123dc68b58edfb418ee88d7b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f18203e880a0d99c6c90f3a686013153d7947c7faacd93fa259101ca0d2af4ac179c178e720c888bdfbb331e1b3ebaf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xeda05ff2d11bdc46c9c11794c97ec54f7d1cb45a113822e7904edd05a49d899e",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x6433ac25b646de762c734180e12ca9542b20a4c93fa9f5156016533a0653d003",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06433ac25b646de762c734180e12ca9542b20a4c93fa9f5156016533a0653d003a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0de3d4351f2dc8a05d2cc1235e7cdfd0cceff7356cdc4215786406ef57f339dd",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555f1",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa0f",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcallcodecallcode_011_OOGMBefore_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "d9a72b130c0ad5a486fe75459442b9223c399b00e375b43e66f1ddd29ab778cb"
+            "sourceHash" : "598bb467375235154359267976910ec76464d2bbdabbab4de73a72a20ee67db2"
         },
         "blocks" : [
             {
@@ -466,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "0x6e3cd9c35d33953162daacb5c1faaa9fea91514add1940be6e73c7287e6d9d11",
-                    "mixHash" : "0x791daeabdf7e276478d2a7dd8901108c99e5096dd69d1b5a9bdc68e0234ddbbe",
-                    "nonce" : "0x83102d81dc087d52",
+                    "hash" : "0xb4cde794286c4156ddb24cdddcfc0eee96f0ecfbb261484570aa33c63a9fe21e",
+                    "mixHash" : "0x5cf643009cd34caf269e6a90c1626817c9830822533df71342c13be8225bde4c",
+                    "nonce" : "0x9b0a697d4ce117a5",
                     "number" : "0x01",
                     "parentHash" : "0xeda05ff2d11bdc46c9c11794c97ec54f7d1cb45a113822e7904edd05a49d899e",
                     "receiptTrie" : "0xb4c484c7054c7eb89f3d6352ae7425ced2acb869a093bdb46c9ae5fba39a219e",
@@ -477,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0eda05ff2d11bdc46c9c11794c97ec54f7d1cb45a113822e7904edd05a49d899ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b914c95a4bbcc650acf60258766891d7fe63a94b20efaa768c4594b5b4cc5727a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0b4c484c7054c7eb89f3d6352ae7425ced2acb869a093bdb46c9ae5fba39a219eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0791daeabdf7e276478d2a7dd8901108c99e5096dd69d1b5a9bdc68e0234ddbbe8883102d81dc087d52f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0eda05ff2d11bdc46c9c11794c97ec54f7d1cb45a113822e7904edd05a49d899ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b914c95a4bbcc650acf60258766891d7fe63a94b20efaa768c4594b5b4cc5727a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0b4c484c7054c7eb89f3d6352ae7425ced2acb869a093bdb46c9ae5fba39a219eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a05cf643009cd34caf269e6a90c1626817c9830822533df71342c13be8225bde4c889b0a697d4ce117a5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -514,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06433ac25b646de762c734180e12ca9542b20a4c93fa9f5156016533a0653d003a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6e3cd9c35d33953162daacb5c1faaa9fea91514add1940be6e73c7287e6d9d11",
+        "lastblockhash" : "0xb4cde794286c4156ddb24cdddcfc0eee96f0ecfbb261484570aa33c63a9fe21e",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -597,155 +297,5 @@
                 }
             }
         }
-    },
-    "callcallcodecallcode_011_OOGMBefore_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/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "d9a72b130c0ad5a486fe75459442b9223c399b00e375b43e66f1ddd29ab778cb"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150c9",
-                    "hash" : "0xa1943f61db7baa29be3ae022e9f14aa0918c9715178c95926848845d27807b27",
-                    "mixHash" : "0xb91686d38d526f4bf6acd7ce832ec3791ceff008ee28d30fac90af5e892d2a41",
-                    "nonce" : "0xe6f413fa749428b6",
-                    "number" : "0x01",
-                    "parentHash" : "0xeda05ff2d11bdc46c9c11794c97ec54f7d1cb45a113822e7904edd05a49d899e",
-                    "receiptTrie" : "0xfd41079bf688c12dbbd5cc00f2fe26737ab7be3dbabdea3055535cd4ed4c691b",
-                    "stateRoot" : "0x79273d7f794cb334b4350d1d6c9e39c394156f796269de3612b2376314c4878e",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0eda05ff2d11bdc46c9c11794c97ec54f7d1cb45a113822e7904edd05a49d899ea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa079273d7f794cb334b4350d1d6c9e39c394156f796269de3612b2376314c4878ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fd41079bf688c12dbbd5cc00f2fe26737ab7be3dbabdea3055535cd4ed4c691bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150c98203e880a0b91686d38d526f4bf6acd7ce832ec3791ceff008ee28d30fac90af5e892d2a4188e6f413fa749428b6f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xeda05ff2d11bdc46c9c11794c97ec54f7d1cb45a113822e7904edd05a49d899e",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x6433ac25b646de762c734180e12ca9542b20a4c93fa9f5156016533a0653d003",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06433ac25b646de762c734180e12ca9542b20a4c93fa9f5156016533a0653d003a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa1943f61db7baa29be3ae022e9f14aa0918c9715178c95926848845d27807b27",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "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" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "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/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEnd_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEnd_d0g0v0.json
index a6222e690..c12b04fa3 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEnd_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEnd_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_SuicideEnd_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "02fc520ded019fb1ff3e10a4bc0190c9b80c715d684cb494208be1684575eb54"
+            "sourceHash" : "1b8d6cfdd13c07e2757e9c609628a4acb873caa00086d86e030c1d42082cb5f8"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e1",
-                    "hash" : "0xa413ecde7fb4ae3addcf92b377bf4a1e26a8588b44b08a0ca902248e9ac7ac12",
-                    "mixHash" : "0x3912244468ebebd319320f480c9ebc39bc8a992a4d361f1b90c20ba5ce728394",
-                    "nonce" : "0x4859aa83cd2d3a13",
+                    "hash" : "0xd956b021b2011ff3a320642299c617568189e855f37eb324fa2f8e53655b8c36",
+                    "mixHash" : "0x7a5c6cc0b92be2249b9126f3c7b4fb36cd02e3fc1cd52877559059042f9a33d5",
+                    "nonce" : "0xabf9285e0cf9f994",
                     "number" : "0x01",
                     "parentHash" : "0x44b5672bf6f75afd38e0376f8e2a239713ba37382997a84362b9e1f2bedbc4f2",
                     "receiptTrie" : "0xcf9330598ab7451b4f09a6b088820b464ad884bf3a1d818226bd82ec45c18b0d",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a044b5672bf6f75afd38e0376f8e2a239713ba37382997a84362b9e1f2bedbc4f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03af57d9e37cc605de0332dc04068b79f18191897d5155f88fc2507f46318feeea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0cf9330598ab7451b4f09a6b088820b464ad884bf3a1d818226bd82ec45c18b0db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e18203e880a03912244468ebebd319320f480c9ebc39bc8a992a4d361f1b90c20ba5ce728394884859aa83cd2d3a13f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a044b5672bf6f75afd38e0376f8e2a239713ba37382997a84362b9e1f2bedbc4f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03af57d9e37cc605de0332dc04068b79f18191897d5155f88fc2507f46318feeea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0cf9330598ab7451b4f09a6b088820b464ad884bf3a1d818226bd82ec45c18b0db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e18203e880a07a5c6cc0b92be2249b9126f3c7b4fb36cd02e3fc1cd52877559059042f9a33d588abf9285e0cf9f994f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f62e64afe91685f83a5d903c10425ae7b9a2e8fab1d4feb7824c1f944321f09a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa413ecde7fb4ae3addcf92b377bf4a1e26a8588b44b08a0ca902248e9ac7ac12",
+        "lastblockhash" : "0xd956b021b2011ff3a320642299c617568189e855f37eb324fa2f8e53655b8c36",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -141,297 +141,13 @@
             }
         }
     },
-    "callcallcodecallcode_011_SuicideEnd_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "02fc520ded019fb1ff3e10a4bc0190c9b80c715d684cb494208be1684575eb54"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0148e1",
-                    "hash" : "0x7684aab82d624ccc570cea72a40c7bd1c3bdfca27f1fc80f78add7bfe2fd7ab4",
-                    "mixHash" : "0x7dcc0e738103d58387a2499171c2e6ea6bc397e7bb1f126cf7e80effa0aa5798",
-                    "nonce" : "0x2d0c46b4a5bea7c9",
-                    "number" : "0x01",
-                    "parentHash" : "0x44b5672bf6f75afd38e0376f8e2a239713ba37382997a84362b9e1f2bedbc4f2",
-                    "receiptTrie" : "0x6760ce22f47104ef8cb51c9bea3714f18591456879d4ebebdf571b3a6ccf4c2b",
-                    "stateRoot" : "0x557019c1b806a3621b5c433a941467b1b161df516188c50d8f82a3af58b6b9c9",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a044b5672bf6f75afd38e0376f8e2a239713ba37382997a84362b9e1f2bedbc4f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0557019c1b806a3621b5c433a941467b1b161df516188c50d8f82a3af58b6b9c9a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a06760ce22f47104ef8cb51c9bea3714f18591456879d4ebebdf571b3a6ccf4c2bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e18203e880a07dcc0e738103d58387a2499171c2e6ea6bc397e7bb1f126cf7e80effa0aa5798882d0c46b4a5bea7c9f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x44b5672bf6f75afd38e0376f8e2a239713ba37382997a84362b9e1f2bedbc4f2",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x9f62e64afe91685f83a5d903c10425ae7b9a2e8fab1d4feb7824c1f944321f09",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f62e64afe91685f83a5d903c10425ae7b9a2e8fab1d4feb7824c1f944321f09a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7684aab82d624ccc570cea72a40c7bd1c3bdfca27f1fc80f78add7bfe2fd7ab4",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b5fb6fe400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000361c350f4600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548e1",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762b71f",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000361c350f4600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcallcodecallcode_011_SuicideEnd_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/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "02fc520ded019fb1ff3e10a4bc0190c9b80c715d684cb494208be1684575eb54"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0148e1",
-                    "hash" : "0xe75ec55335e80ec7c4cfe2c27aedf5eec22ac48be5472cbf4c4795abdf829e17",
-                    "mixHash" : "0x0fef36d2529c0c5f278c1595707dd7c82fa1e298c438e03792aa08e80da4f0b9",
-                    "nonce" : "0x0c41dad36aff6910",
-                    "number" : "0x01",
-                    "parentHash" : "0x44b5672bf6f75afd38e0376f8e2a239713ba37382997a84362b9e1f2bedbc4f2",
-                    "receiptTrie" : "0x6760ce22f47104ef8cb51c9bea3714f18591456879d4ebebdf571b3a6ccf4c2b",
-                    "stateRoot" : "0x557019c1b806a3621b5c433a941467b1b161df516188c50d8f82a3af58b6b9c9",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a044b5672bf6f75afd38e0376f8e2a239713ba37382997a84362b9e1f2bedbc4f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0557019c1b806a3621b5c433a941467b1b161df516188c50d8f82a3af58b6b9c9a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a06760ce22f47104ef8cb51c9bea3714f18591456879d4ebebdf571b3a6ccf4c2bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e18203e880a00fef36d2529c0c5f278c1595707dd7c82fa1e298c438e03792aa08e80da4f0b9880c41dad36aff6910f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x44b5672bf6f75afd38e0376f8e2a239713ba37382997a84362b9e1f2bedbc4f2",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x9f62e64afe91685f83a5d903c10425ae7b9a2e8fab1d4feb7824c1f944321f09",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f62e64afe91685f83a5d903c10425ae7b9a2e8fab1d4feb7824c1f944321f09a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe75ec55335e80ec7c4cfe2c27aedf5eec22ac48be5472cbf4c4795abdf829e17",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b5fb6fe400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000361c350f4600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548e1",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762b71f",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000361c350f4600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcallcodecallcode_011_SuicideEnd_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "02fc520ded019fb1ff3e10a4bc0190c9b80c715d684cb494208be1684575eb54"
+            "sourceHash" : "1b8d6cfdd13c07e2757e9c609628a4acb873caa00086d86e030c1d42082cb5f8"
         },
         "blocks" : [
             {
@@ -442,9 +158,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x02afc6",
-                    "hash" : "0x261d423fb187175b8f23347e72aad2874ebb22754d2afe01d657b392755a9e36",
-                    "mixHash" : "0xe89a0e04ecb2c84c7eee1111dbc645a8a67fec0298756a558f45cf27455732e9",
-                    "nonce" : "0x973dd9e5a31a09fe",
+                    "hash" : "0x9e0a46dbeea408dd4a69119997364b9d116f11b99d4d40be46bc01ca8dba4ca3",
+                    "mixHash" : "0x32b3d4397e0242b89c3476675ae0ed2bb3935834668d79624d999f110756b236",
+                    "nonce" : "0x1aa355c1cae6cc57",
                     "number" : "0x01",
                     "parentHash" : "0x44b5672bf6f75afd38e0376f8e2a239713ba37382997a84362b9e1f2bedbc4f2",
                     "receiptTrie" : "0xe041195474281299bb56a78959e3987ff44bb9aa4e0ff4bd45bdd1b86369bf22",
@@ -453,10 +169,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a044b5672bf6f75afd38e0376f8e2a239713ba37382997a84362b9e1f2bedbc4f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa064530304978051bed8238c7b16c037b0743631e16687c0526cb185a914d223a4a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e041195474281299bb56a78959e3987ff44bb9aa4e0ff4bd45bdd1b86369bf22b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808302afc68203e880a0e89a0e04ecb2c84c7eee1111dbc645a8a67fec0298756a558f45cf27455732e988973dd9e5a31a09fef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a044b5672bf6f75afd38e0376f8e2a239713ba37382997a84362b9e1f2bedbc4f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa064530304978051bed8238c7b16c037b0743631e16687c0526cb185a914d223a4a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e041195474281299bb56a78959e3987ff44bb9aa4e0ff4bd45bdd1b86369bf22b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808302afc68203e880a032b3d4397e0242b89c3476675ae0ed2bb3935834668d79624d999f110756b236881aa355c1cae6cc57f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -490,7 +206,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f62e64afe91685f83a5d903c10425ae7b9a2e8fab1d4feb7824c1f944321f09a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x261d423fb187175b8f23347e72aad2874ebb22754d2afe01d657b392755a9e36",
+        "lastblockhash" : "0x9e0a46dbeea408dd4a69119997364b9d116f11b99d4d40be46bc01ca8dba4ca3",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -573,147 +289,5 @@
                 }
             }
         }
-    },
-    "callcallcodecallcode_011_SuicideEnd_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/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "02fc520ded019fb1ff3e10a4bc0190c9b80c715d684cb494208be1684575eb54"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x012d9d",
-                    "hash" : "0x00526e3336af2d2fcce24d3b26bd93eaab38487ef8b1eecad91eeec9acaa9f02",
-                    "mixHash" : "0xae60b1e069ec9b999fd5f9b3f5244b27af613674532f69cad1ab49cbfcfc5644",
-                    "nonce" : "0x5ad22d76be01431e",
-                    "number" : "0x01",
-                    "parentHash" : "0x44b5672bf6f75afd38e0376f8e2a239713ba37382997a84362b9e1f2bedbc4f2",
-                    "receiptTrie" : "0xd5c06e896d71a3391955db194c1042ebd5794a6dc97138ad122ffe4a6e9afab2",
-                    "stateRoot" : "0x7b92a15cf497d6ec3ccac2ee84d24739d94a1f123faf7d1efe4d0d3d51097e8c",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a044b5672bf6f75afd38e0376f8e2a239713ba37382997a84362b9e1f2bedbc4f2a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07b92a15cf497d6ec3ccac2ee84d24739d94a1f123faf7d1efe4d0d3d51097e8ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d5c06e896d71a3391955db194c1042ebd5794a6dc97138ad122ffe4a6e9afab2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012d9d8203e880a0ae60b1e069ec9b999fd5f9b3f5244b27af613674532f69cad1ab49cbfcfc5644885ad22d76be01431ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x44b5672bf6f75afd38e0376f8e2a239713ba37382997a84362b9e1f2bedbc4f2",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x9f62e64afe91685f83a5d903c10425ae7b9a2e8fab1d4feb7824c1f944321f09",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f62e64afe91685f83a5d903c10425ae7b9a2e8fab1d4feb7824c1f944321f09a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x00526e3336af2d2fcce24d3b26bd93eaab38487ef8b1eecad91eeec9acaa9f02",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b5fb6fe400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000361c350f4600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f52d9d",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762d263",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000361c350f4600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddle_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddle_d0g0v0.json
index ae1c57cfb..4ecbff850 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddle_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddle_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_SuicideMiddle_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "c38230a0f6c8345a16df136a4cbd65a6aad513e4e5fee80d4fe4974c521d00c4"
+            "sourceHash" : "564e0ad8a8f34a3344e19fe8a95b80c42c9a8544ff55d7f4352eca62dd077a4b"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c4",
-                    "hash" : "0x0ce1948a05e919a9e7c43191452fbb0bbfc13bb17963a8c0abdc3a99e6dd45ac",
-                    "mixHash" : "0xcae39198790d914fd136fc2667a4f87687c26a33803cd8ddd0a83e7cb206670a",
-                    "nonce" : "0x006c18f0b6a7fe23",
+                    "hash" : "0x85a855f142e3bbc7aa562d94bc065a17dddf8be020817b3f2a5d79f72094529d",
+                    "mixHash" : "0x7552b616bf0b7c238180ec930f0679b8e7f282a5ce127883c622be83c16182bc",
+                    "nonce" : "0x20e089981aae694f",
                     "number" : "0x01",
                     "parentHash" : "0x9b30fc771fef430aff6803288170c5a242903140dd8826bc84141fc0ffdbd145",
                     "receiptTrie" : "0x9cfe338f99c36eb562687de6302f5f1018f7c7847c8593f83122637b4e445fb2",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a09b30fc771fef430aff6803288170c5a242903140dd8826bc84141fc0ffdbd145a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00f04b36c2c69ac2eb373990ee9d34325f347f369c3e121d3134b19a60ee0a626a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09cfe338f99c36eb562687de6302f5f1018f7c7847c8593f83122637b4e445fb2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c48203e880a0cae39198790d914fd136fc2667a4f87687c26a33803cd8ddd0a83e7cb206670a88006c18f0b6a7fe23f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a09b30fc771fef430aff6803288170c5a242903140dd8826bc84141fc0ffdbd145a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00f04b36c2c69ac2eb373990ee9d34325f347f369c3e121d3134b19a60ee0a626a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09cfe338f99c36eb562687de6302f5f1018f7c7847c8593f83122637b4e445fb2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c48203e880a07552b616bf0b7c238180ec930f0679b8e7f282a5ce127883c622be83c16182bc8820e089981aae694ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0443790ce2d29647e45b4b2d8dc752de8b44022e1741c2b2a1f31218479512aaba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0ce1948a05e919a9e7c43191452fbb0bbfc13bb17963a8c0abdc3a99e6dd45ac",
+        "lastblockhash" : "0x85a855f142e3bbc7aa562d94bc065a17dddf8be020817b3f2a5d79f72094529d",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -141,297 +141,13 @@
             }
         }
     },
-    "callcallcodecallcode_011_SuicideMiddle_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "c38230a0f6c8345a16df136a4cbd65a6aad513e4e5fee80d4fe4974c521d00c4"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c4",
-                    "hash" : "0x5dc2f1e22f2988273f4b16c0a28d2a316d276ffeca8aa9f39fe471dbbe6395e6",
-                    "mixHash" : "0x72b6b9da6d6827bec41d301ea397cc9a8034c39d3507e8c47185e1fcf5c203f2",
-                    "nonce" : "0x8c875d40dd5edbbd",
-                    "number" : "0x01",
-                    "parentHash" : "0x9b30fc771fef430aff6803288170c5a242903140dd8826bc84141fc0ffdbd145",
-                    "receiptTrie" : "0x84b890c1b09b67513b78a40fefb699f668f66bd005b6d5afa84c9193c6e08a11",
-                    "stateRoot" : "0xdc6164973db5701cb0e9dc493e9f149be0ec9d4a37eba86fa3a7eac00b616359",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a09b30fc771fef430aff6803288170c5a242903140dd8826bc84141fc0ffdbd145a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc6164973db5701cb0e9dc493e9f149be0ec9d4a37eba86fa3a7eac00b616359a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a084b890c1b09b67513b78a40fefb699f668f66bd005b6d5afa84c9193c6e08a11b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c48203e880a072b6b9da6d6827bec41d301ea397cc9a8034c39d3507e8c47185e1fcf5c203f2888c875d40dd5edbbdf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x9b30fc771fef430aff6803288170c5a242903140dd8826bc84141fc0ffdbd145",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x443790ce2d29647e45b4b2d8dc752de8b44022e1741c2b2a1f31218479512aab",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0443790ce2d29647e45b4b2d8dc752de8b44022e1741c2b2a1f31218479512aaba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5dc2f1e22f2988273f4b16c0a28d2a316d276ffeca8aa9f39fe471dbbe6395e6",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c4",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a763563c",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcallcodecallcode_011_SuicideMiddle_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/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "c38230a0f6c8345a16df136a4cbd65a6aad513e4e5fee80d4fe4974c521d00c4"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c4",
-                    "hash" : "0x6ff6e2976e4062ddcba2c80f4b3d6cda461d4b1f878ea7f752fe47e708c00751",
-                    "mixHash" : "0xa4e12c195ca18938fbd592fa740c9876d22f9b605a0004aa686cfe61ea1938b6",
-                    "nonce" : "0x3fdcf791329eb34b",
-                    "number" : "0x01",
-                    "parentHash" : "0x9b30fc771fef430aff6803288170c5a242903140dd8826bc84141fc0ffdbd145",
-                    "receiptTrie" : "0x84b890c1b09b67513b78a40fefb699f668f66bd005b6d5afa84c9193c6e08a11",
-                    "stateRoot" : "0xdc6164973db5701cb0e9dc493e9f149be0ec9d4a37eba86fa3a7eac00b616359",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a09b30fc771fef430aff6803288170c5a242903140dd8826bc84141fc0ffdbd145a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dc6164973db5701cb0e9dc493e9f149be0ec9d4a37eba86fa3a7eac00b616359a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a084b890c1b09b67513b78a40fefb699f668f66bd005b6d5afa84c9193c6e08a11b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c48203e880a0a4e12c195ca18938fbd592fa740c9876d22f9b605a0004aa686cfe61ea1938b6883fdcf791329eb34bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x9b30fc771fef430aff6803288170c5a242903140dd8826bc84141fc0ffdbd145",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x443790ce2d29647e45b4b2d8dc752de8b44022e1741c2b2a1f31218479512aab",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0443790ce2d29647e45b4b2d8dc752de8b44022e1741c2b2a1f31218479512aaba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6ff6e2976e4062ddcba2c80f4b3d6cda461d4b1f878ea7f752fe47e708c00751",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c4",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a763563c",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcallcodecallcode_011_SuicideMiddle_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "c38230a0f6c8345a16df136a4cbd65a6aad513e4e5fee80d4fe4974c521d00c4"
+            "sourceHash" : "564e0ad8a8f34a3344e19fe8a95b80c42c9a8544ff55d7f4352eca62dd077a4b"
         },
         "blocks" : [
             {
@@ -442,9 +158,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x02afc6",
-                    "hash" : "0xac871cecda2364a7bfea05e2d2eb4c618dc615a4449a5197380fc49284771197",
-                    "mixHash" : "0x0f67c0be491bccb52f923706242de5a57e2d7798effde4f2bbc1f38d46c387ab",
-                    "nonce" : "0x0be164b2b8baeb12",
+                    "hash" : "0x380f5065bbcc8fc4c2d3028fbef65ca07e31ab8ac2b541c072e92a6bf509e919",
+                    "mixHash" : "0xb60533699b13dce2075803fa1ec2dfa3d45faf27e4731a96fd6e9c97f632bbb9",
+                    "nonce" : "0xfb23f254c1e397a9",
                     "number" : "0x01",
                     "parentHash" : "0x9b30fc771fef430aff6803288170c5a242903140dd8826bc84141fc0ffdbd145",
                     "receiptTrie" : "0xa67b08f750100131a8a317831e09efd2847424d7617a8d26e969b57c92fc47f2",
@@ -453,10 +169,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a09b30fc771fef430aff6803288170c5a242903140dd8826bc84141fc0ffdbd145a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb8423e771d3a9813897a4e3adb753215e565c2c9df50ac7e80bcd958f0d8430a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0a67b08f750100131a8a317831e09efd2847424d7617a8d26e969b57c92fc47f2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808302afc68203e880a00f67c0be491bccb52f923706242de5a57e2d7798effde4f2bbc1f38d46c387ab880be164b2b8baeb12f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a09b30fc771fef430aff6803288170c5a242903140dd8826bc84141fc0ffdbd145a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb8423e771d3a9813897a4e3adb753215e565c2c9df50ac7e80bcd958f0d8430a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0a67b08f750100131a8a317831e09efd2847424d7617a8d26e969b57c92fc47f2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808302afc68203e880a0b60533699b13dce2075803fa1ec2dfa3d45faf27e4731a96fd6e9c97f632bbb988fb23f254c1e397a9f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -490,7 +206,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0443790ce2d29647e45b4b2d8dc752de8b44022e1741c2b2a1f31218479512aaba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xac871cecda2364a7bfea05e2d2eb4c618dc615a4449a5197380fc49284771197",
+        "lastblockhash" : "0x380f5065bbcc8fc4c2d3028fbef65ca07e31ab8ac2b541c072e92a6bf509e919",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -573,147 +289,5 @@
                 }
             }
         }
-    },
-    "callcallcodecallcode_011_SuicideMiddle_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/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "c38230a0f6c8345a16df136a4cbd65a6aad513e4e5fee80d4fe4974c521d00c4"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x9114",
-                    "hash" : "0x47ae05401723ce2a836d0bc041618c79f2a77fa0e254b9e1683669c69fb2bfb1",
-                    "mixHash" : "0xe0740af82814dd36ac93ebea5bf399fbb28c1fec071ef3b0874b0adc6d3bcdde",
-                    "nonce" : "0xbdb3c3d1f34fd994",
-                    "number" : "0x01",
-                    "parentHash" : "0x9b30fc771fef430aff6803288170c5a242903140dd8826bc84141fc0ffdbd145",
-                    "receiptTrie" : "0x8a3eba395ae7887dd2e63025eaa70f906e19d3d12fd467fcc7d29d8a26fced34",
-                    "stateRoot" : "0x9c1ee9919b8fd5d1940811fe9d90bdf35e6c7a10de2741dbd0c03bdc6305a903",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a09b30fc771fef430aff6803288170c5a242903140dd8826bc84141fc0ffdbd145a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09c1ee9919b8fd5d1940811fe9d90bdf35e6c7a10de2741dbd0c03bdc6305a903a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a08a3eba395ae7887dd2e63025eaa70f906e19d3d12fd467fcc7d29d8a26fced34b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291148203e880a0e0740af82814dd36ac93ebea5bf399fbb28c1fec071ef3b0874b0adc6d3bcdde88bdb3c3d1f34fd994f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x9b30fc771fef430aff6803288170c5a242903140dd8826bc84141fc0ffdbd145",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x443790ce2d29647e45b4b2d8dc752de8b44022e1741c2b2a1f31218479512aab",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0443790ce2d29647e45b4b2d8dc752de8b44022e1741c2b2a1f31218479512aaba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x47ae05401723ce2a836d0bc041618c79f2a77fa0e254b9e1683669c69fb2bfb1",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49114",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7636eec",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000001620249f0f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_d0g0v0.json
index dfd87694c..a958c2da3 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_011_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_d0g0v0Filler.json",
-            "sourceHash" : "1110e328a691483a0659997b8e980045af53c93fcd97ecbfed9f238ca2093ed8"
+            "sourceHash" : "9c84eeb6f8b3980b389e6321b4a7400dbd1ae2dbfe6ebf5fc9a0824c93fb95d3"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x03d045",
-                    "hash" : "0xa6f76fc80ce25ac3c62728ead15c300d6d47f30a6dfb11e3f1d6706ad2d56fe4",
-                    "mixHash" : "0x9bb49d34af1bd1c986e26fa4de1bd9e4c0e565ab4a16ae40c6d3fa0fd90fdc69",
-                    "nonce" : "0x426a71fab2a2346d",
+                    "hash" : "0x9e36e9f0884f528d908a089133adc7dd60365707d59c66e34d101aa8c1ebb6b6",
+                    "mixHash" : "0x15bd1cdd5c4f80a3a15ebdb8ba34f4af165cf68cd67f475953e4b4ec1665fb62",
+                    "nonce" : "0x40ab6d30cdd5690e",
                     "number" : "0x01",
                     "parentHash" : "0x8ef1d2404a98439840905611b4d7138aad00f9b9ffd0a475b3f6f299e3e759c1",
                     "receiptTrie" : "0x446ff47226083263c10b866d4dedf53ea070f8c2ebe09c1a53e6aff2afabdfa2",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a08ef1d2404a98439840905611b4d7138aad00f9b9ffd0a475b3f6f299e3e759c1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa014b4225c85019f78b519893fd44c57b1bc7a82cf08a3b5e3bb1599d8f75815dca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0446ff47226083263c10b866d4dedf53ea070f8c2ebe09c1a53e6aff2afabdfa2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303d0458203e880a09bb49d34af1bd1c986e26fa4de1bd9e4c0e565ab4a16ae40c6d3fa0fd90fdc6988426a71fab2a2346df862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a08ef1d2404a98439840905611b4d7138aad00f9b9ffd0a475b3f6f299e3e759c1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa014b4225c85019f78b519893fd44c57b1bc7a82cf08a3b5e3bb1599d8f75815dca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0446ff47226083263c10b866d4dedf53ea070f8c2ebe09c1a53e6aff2afabdfa2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303d0458203e880a015bd1cdd5c4f80a3a15ebdb8ba34f4af165cf68cd67f475953e4b4ec1665fb628840ab6d30cdd5690ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df684f6c73875663d7e829612c403bdd5ca4453796edf45afea2de4ca094bef7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa6f76fc80ce25ac3c62728ead15c300d6d47f30a6dfb11e3f1d6706ad2d56fe4",
+        "lastblockhash" : "0x9e36e9f0884f528d908a089133adc7dd60365707d59c66e34d101aa8c1ebb6b6",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -159,333 +159,13 @@
             }
         }
     },
-    "callcallcodecallcode_011_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_d0g0v0Filler.json",
-            "sourceHash" : "1110e328a691483a0659997b8e980045af53c93fcd97ecbfed9f238ca2093ed8"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x03d045",
-                    "hash" : "0x64e45dfee1cbcb10f94d195deb552a997b94ac2e59189599bb732cb279933e5b",
-                    "mixHash" : "0xdc8c5066917568c0c305fcaefd021d32e982355aadc0ffd94eaa0fb245a367b7",
-                    "nonce" : "0xdcde22b2972ad9dc",
-                    "number" : "0x01",
-                    "parentHash" : "0x8ef1d2404a98439840905611b4d7138aad00f9b9ffd0a475b3f6f299e3e759c1",
-                    "receiptTrie" : "0x8272d13cba59699575d78527fdf5fc4b6589437887ef928873cbe0d422c68ba3",
-                    "stateRoot" : "0x22dc7f0c7634a4adb85ffa180f9d5a95eed68799ff3aeea934a7b4d04b17230a",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a08ef1d2404a98439840905611b4d7138aad00f9b9ffd0a475b3f6f299e3e759c1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa022dc7f0c7634a4adb85ffa180f9d5a95eed68799ff3aeea934a7b4d04b17230aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a08272d13cba59699575d78527fdf5fc4b6589437887ef928873cbe0d422c68ba3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303d0458203e880a0dc8c5066917568c0c305fcaefd021d32e982355aadc0ffd94eaa0fb245a367b788dcde22b2972ad9dcf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x8ef1d2404a98439840905611b4d7138aad00f9b9ffd0a475b3f6f299e3e759c1",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xdf684f6c73875663d7e829612c403bdd5ca4453796edf45afea2de4ca094bef7",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df684f6c73875663d7e829612c403bdd5ca4453796edf45afea2de4ca094bef7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x64e45dfee1cbcb10f94d195deb552a997b94ac2e59189599bb732cb279933e5b",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x014a" : "0x1000000000000000000000000000000000000000",
-                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x0150" : "0x40",
-                    "0x0152" : "0x26",
-                    "0x0154" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01",
-                    "0x04" : "0x1000000000000000000000000000000000000000",
-                    "0x06" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000362030d40f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346006553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f7d045",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7602fbb",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000362030d40f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346006553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcallcodecallcode_011_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/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_d0g0v0Filler.json",
-            "sourceHash" : "1110e328a691483a0659997b8e980045af53c93fcd97ecbfed9f238ca2093ed8"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x03d045",
-                    "hash" : "0xe4d160bb1accb1827cc2264a5866c08a429b8fd9eb274df66dc48789b2b3e583",
-                    "mixHash" : "0x1ef87d03eeb480210639f88ac90859bc448ef039efacd123cdf749b6a14d75a2",
-                    "nonce" : "0xf18e4a58815cc3cc",
-                    "number" : "0x01",
-                    "parentHash" : "0x8ef1d2404a98439840905611b4d7138aad00f9b9ffd0a475b3f6f299e3e759c1",
-                    "receiptTrie" : "0x8272d13cba59699575d78527fdf5fc4b6589437887ef928873cbe0d422c68ba3",
-                    "stateRoot" : "0x22dc7f0c7634a4adb85ffa180f9d5a95eed68799ff3aeea934a7b4d04b17230a",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a08ef1d2404a98439840905611b4d7138aad00f9b9ffd0a475b3f6f299e3e759c1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa022dc7f0c7634a4adb85ffa180f9d5a95eed68799ff3aeea934a7b4d04b17230aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a08272d13cba59699575d78527fdf5fc4b6589437887ef928873cbe0d422c68ba3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303d0458203e880a01ef87d03eeb480210639f88ac90859bc448ef039efacd123cdf749b6a14d75a288f18e4a58815cc3ccf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x8ef1d2404a98439840905611b4d7138aad00f9b9ffd0a475b3f6f299e3e759c1",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xdf684f6c73875663d7e829612c403bdd5ca4453796edf45afea2de4ca094bef7",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df684f6c73875663d7e829612c403bdd5ca4453796edf45afea2de4ca094bef7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe4d160bb1accb1827cc2264a5866c08a429b8fd9eb274df66dc48789b2b3e583",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x014a" : "0x1000000000000000000000000000000000000000",
-                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x0150" : "0x40",
-                    "0x0152" : "0x26",
-                    "0x0154" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01",
-                    "0x04" : "0x1000000000000000000000000000000000000000",
-                    "0x06" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000362030d40f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346006553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f7d045",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7602fbb",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000362030d40f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346006553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcallcodecallcode_011_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_d0g0v0Filler.json",
-            "sourceHash" : "1110e328a691483a0659997b8e980045af53c93fcd97ecbfed9f238ca2093ed8"
+            "sourceHash" : "9c84eeb6f8b3980b389e6321b4a7400dbd1ae2dbfe6ebf5fc9a0824c93fb95d3"
         },
         "blocks" : [
             {
@@ -496,9 +176,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x05e02e",
-                    "hash" : "0xf16f685313dbb4d8d93e60a6b419c39cdb294204b879bff5b92e08b167698a03",
-                    "mixHash" : "0xd2389cb9fed726776e813451b9fbcabd5ad87364e98dff6596e60aff11c43919",
-                    "nonce" : "0x30895a88f852260d",
+                    "hash" : "0x595ccaacf863fe8ecf80dd9d941ab6de333a5f8230357b9a33afc21525cbacea",
+                    "mixHash" : "0xb5478d57b94e85042ab44678140aa509a30e16c7184352faf5027e31c012d40f",
+                    "nonce" : "0x6c23f03cbe857d2b",
                     "number" : "0x01",
                     "parentHash" : "0x8ef1d2404a98439840905611b4d7138aad00f9b9ffd0a475b3f6f299e3e759c1",
                     "receiptTrie" : "0x3ce2f5214778570baf891654fc832eff66b08bc1446f87c5213d262cd82e40b0",
@@ -507,10 +187,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a08ef1d2404a98439840905611b4d7138aad00f9b9ffd0a475b3f6f299e3e759c1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bdce6e43a31248d4ce320e76ed1afebc0cb1ae3be3e6cdf309cb22e1a4950352a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03ce2f5214778570baf891654fc832eff66b08bc1446f87c5213d262cd82e40b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808305e02e8203e880a0d2389cb9fed726776e813451b9fbcabd5ad87364e98dff6596e60aff11c439198830895a88f852260df862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a08ef1d2404a98439840905611b4d7138aad00f9b9ffd0a475b3f6f299e3e759c1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bdce6e43a31248d4ce320e76ed1afebc0cb1ae3be3e6cdf309cb22e1a4950352a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03ce2f5214778570baf891654fc832eff66b08bc1446f87c5213d262cd82e40b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808305e02e8203e880a0b5478d57b94e85042ab44678140aa509a30e16c7184352faf5027e31c012d40f886c23f03cbe857d2bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -544,7 +224,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df684f6c73875663d7e829612c403bdd5ca4453796edf45afea2de4ca094bef7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf16f685313dbb4d8d93e60a6b419c39cdb294204b879bff5b92e08b167698a03",
+        "lastblockhash" : "0x595ccaacf863fe8ecf80dd9d941ab6de333a5f8230357b9a33afc21525cbacea",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -627,165 +307,5 @@
                 }
             }
         }
-    },
-    "callcallcodecallcode_011_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/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_011_d0g0v0Filler.json",
-            "sourceHash" : "1110e328a691483a0659997b8e980045af53c93fcd97ecbfed9f238ca2093ed8"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x03c889",
-                    "hash" : "0x8a242298da3809e66c08ee0aaaed091098fb369d3e4ef5c25418fdfadfe9315b",
-                    "mixHash" : "0xc89f5e234925a259e49f09e134d51a80ddc2480db552ae5bc77820c9a24ad5d2",
-                    "nonce" : "0x17e07e7387a4aa93",
-                    "number" : "0x01",
-                    "parentHash" : "0x8ef1d2404a98439840905611b4d7138aad00f9b9ffd0a475b3f6f299e3e759c1",
-                    "receiptTrie" : "0x0ec5da600837ac3bada8edad068f53e0f69b428c17367c28b07413b045b3fb38",
-                    "stateRoot" : "0x2b95d7e3798aa49db54d980a5d73a0c1bac30e381dc6d9830b76d49548315ed9",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a08ef1d2404a98439840905611b4d7138aad00f9b9ffd0a475b3f6f299e3e759c1a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b95d7e3798aa49db54d980a5d73a0c1bac30e381dc6d9830b76d49548315ed9a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a00ec5da600837ac3bada8edad068f53e0f69b428c17367c28b07413b045b3fb38b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303c8898203e880a0c89f5e234925a259e49f09e134d51a80ddc2480db552ae5bc77820c9a24ad5d28817e07e7387a4aa93f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x8ef1d2404a98439840905611b4d7138aad00f9b9ffd0a475b3f6f299e3e759c1",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xdf684f6c73875663d7e829612c403bdd5ca4453796edf45afea2de4ca094bef7",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df684f6c73875663d7e829612c403bdd5ca4453796edf45afea2de4ca094bef7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8a242298da3809e66c08ee0aaaed091098fb369d3e4ef5c25418fdfadfe9315b",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x014a" : "0x1000000000000000000000000000000000000000",
-                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x0150" : "0x40",
-                    "0x0152" : "0x26",
-                    "0x0154" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01",
-                    "0x04" : "0x1000000000000000000000000000000000000000",
-                    "0x06" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000362030d40f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346006553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f7c889",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7603777",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600173100000000000000000000000000000000000000162055730f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000362030d40f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346006553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0.json
index 628b97b9e..beca79c31 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcallcodecallcode_ABCB_RECURSIVE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "501fd2c5860802e11a884639a6df73aae8daeb058252121c23805b66794fce18"
+            "sourceHash" : "fae72c64a29ad2b294759e55a55d4376b5b6bd9b2783f540d37a00094e41b98b"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab78",
-                    "hash" : "0xaa08636ce7ae735b9fd62860e73639e0336636c06a70e0b239ac2cda3106295c",
-                    "mixHash" : "0x72b68f7d6d01926e7115cb9dea642f562cf728f85ebd94a686884c2902290fc5",
-                    "nonce" : "0x3ea63de4e8c85a2c",
+                    "hash" : "0x6a1783ca6de82dd373be1f96d37705b7758dcbaf09a4b58e3fcd8caa2721bed7",
+                    "mixHash" : "0x9e58cd8e8d477558b82adf40a134b7fc3a78d42f9cf3252e04be8b6756aa6e3d",
+                    "nonce" : "0x1ef7982d912f02f4",
                     "number" : "0x01",
                     "parentHash" : "0xefb7f759f4efeb0a3f512a223a707329d5de7a45f2923c370b79b21182692493",
                     "receiptTrie" : "0x29a19a0aaaab34a36ad92b7ff6b4e7ff702697c39fe7cf47ee0576931eba0bc9",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0efb7f759f4efeb0a3f512a223a707329d5de7a45f2923c370b79b21182692493a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e161db00e556d2d4aa85c8bdb110b4f42d7be7aaec935947a9f69d2fc19237e8a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a029a19a0aaaab34a36ad92b7ff6b4e7ff702697c39fe7cf47ee0576931eba0bc9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab788203e880a072b68f7d6d01926e7115cb9dea642f562cf728f85ebd94a686884c2902290fc5883ea63de4e8c85a2cf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0efb7f759f4efeb0a3f512a223a707329d5de7a45f2923c370b79b21182692493a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e161db00e556d2d4aa85c8bdb110b4f42d7be7aaec935947a9f69d2fc19237e8a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a029a19a0aaaab34a36ad92b7ff6b4e7ff702697c39fe7cf47ee0576931eba0bc9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab788203e880a09e58cd8e8d477558b82adf40a134b7fc3a78d42f9cf3252e04be8b6756aa6e3d881ef7982d912f02f4f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9c93dce1035f96d7709a135cd20fccdc4bd11e5553bd84628b690d8f7f5f192a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaa08636ce7ae735b9fd62860e73639e0336636c06a70e0b239ac2cda3106295c",
+        "lastblockhash" : "0x6a1783ca6de82dd373be1f96d37705b7758dcbaf09a4b58e3fcd8caa2721bed7",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -136,287 +136,13 @@
             }
         }
     },
-    "callcallcodecallcode_ABCB_RECURSIVE_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "501fd2c5860802e11a884639a6df73aae8daeb058252121c23805b66794fce18"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08ab78",
-                    "hash" : "0xc889089854bc45c5f087c998a35f41d251b33375c625980b0744c55e10b9e9ae",
-                    "mixHash" : "0x94c06524f9ed58d9050301a37ed77c5b567e350a77a9004e219c9f5785955e26",
-                    "nonce" : "0x34909b882b2b64e0",
-                    "number" : "0x01",
-                    "parentHash" : "0xefb7f759f4efeb0a3f512a223a707329d5de7a45f2923c370b79b21182692493",
-                    "receiptTrie" : "0xd003c0c32171905fb79cdb654a0a1d41b06d76fcd13763301082ab7ed445f453",
-                    "stateRoot" : "0x6a1647aa3fd7c2c4fb25e5faca01723fccb1dd423e540ccb2084457dcbb3e332",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f9a0efb7f759f4efeb0a3f512a223a707329d5de7a45f2923c370b79b21182692493a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a1647aa3fd7c2c4fb25e5faca01723fccb1dd423e540ccb2084457dcbb3e332a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0d003c0c32171905fb79cdb654a0a1d41b06d76fcd13763301082ab7ed445f453b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab788203e880a094c06524f9ed58d9050301a37ed77c5b567e350a77a9004e219c9f5785955e268834909b882b2b64e0f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x01c9c380",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
-                        "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0xb2d05e00",
-            "gasUsed" : "0x00",
-            "hash" : "0xefb7f759f4efeb0a3f512a223a707329d5de7a45f2923c370b79b21182692493",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe9c93dce1035f96d7709a135cd20fccdc4bd11e5553bd84628b690d8f7f5f192",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9c93dce1035f96d7709a135cd20fccdc4bd11e5553bd84628b690d8f7f5f192a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc889089854bc45c5f087c998a35f41d251b33375c625980b0744c55e10b9e9ae",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620f4240f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000016207a120f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fcab78",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5488",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620f4240f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000016207a120f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcallcodecallcode_ABCB_RECURSIVE_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/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "501fd2c5860802e11a884639a6df73aae8daeb058252121c23805b66794fce18"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08ab78",
-                    "hash" : "0xadb14ceb974b0a155eaf2aea54b5d9d143293b395d1d1969ee2b8180462f06c3",
-                    "mixHash" : "0xfa0901a484a343330c0293f885130de9c829baa4a029e141ab19ba00ee3b20a5",
-                    "nonce" : "0x2cbc09abbb7065de",
-                    "number" : "0x01",
-                    "parentHash" : "0xefb7f759f4efeb0a3f512a223a707329d5de7a45f2923c370b79b21182692493",
-                    "receiptTrie" : "0xd003c0c32171905fb79cdb654a0a1d41b06d76fcd13763301082ab7ed445f453",
-                    "stateRoot" : "0x6a1647aa3fd7c2c4fb25e5faca01723fccb1dd423e540ccb2084457dcbb3e332",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f9a0efb7f759f4efeb0a3f512a223a707329d5de7a45f2923c370b79b21182692493a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06a1647aa3fd7c2c4fb25e5faca01723fccb1dd423e540ccb2084457dcbb3e332a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0d003c0c32171905fb79cdb654a0a1d41b06d76fcd13763301082ab7ed445f453b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab788203e880a0fa0901a484a343330c0293f885130de9c829baa4a029e141ab19ba00ee3b20a5882cbc09abbb7065def863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x01c9c380",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
-                        "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0xb2d05e00",
-            "gasUsed" : "0x00",
-            "hash" : "0xefb7f759f4efeb0a3f512a223a707329d5de7a45f2923c370b79b21182692493",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe9c93dce1035f96d7709a135cd20fccdc4bd11e5553bd84628b690d8f7f5f192",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9c93dce1035f96d7709a135cd20fccdc4bd11e5553bd84628b690d8f7f5f192a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xadb14ceb974b0a155eaf2aea54b5d9d143293b395d1d1969ee2b8180462f06c3",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620f4240f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000016207a120f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fcab78",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5488",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000163017d7840f2600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620f4240f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000016207a120f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcallcodecallcode_ABCB_RECURSIVE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "501fd2c5860802e11a884639a6df73aae8daeb058252121c23805b66794fce18"
+            "sourceHash" : "fae72c64a29ad2b294759e55a55d4376b5b6bd9b2783f540d37a00094e41b98b"
         },
         "blocks" : [
             {
@@ -427,9 +153,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x017dde16",
-                    "hash" : "0x2b1ee8939c73630c0f581fea0eb6539b8b46080f662d50f716515d0474f4d6d3",
-                    "mixHash" : "0x688cd0d447645cebe389750183e30c47510930275f92cdc88c051006a6e1159e",
-                    "nonce" : "0x22e1f5819d584a52",
+                    "hash" : "0xd7c3d71a4cac513eda4f51d4b58fc2614bf765939a8fb7822fb76feac0c07154",
+                    "mixHash" : "0xc800c5f513f8a9a27828c8a211c0e44df32265ba5008fde90e583cf62df40425",
+                    "nonce" : "0x6dbe6b4655aba779",
                     "number" : "0x01",
                     "parentHash" : "0xefb7f759f4efeb0a3f512a223a707329d5de7a45f2923c370b79b21182692493",
                     "receiptTrie" : "0xf208b31fc4df920fe0b37ed4219e29ce3167cbc07468667c5b30b17d9bda2faa",
@@ -438,10 +164,10 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0efb7f759f4efeb0a3f512a223a707329d5de7a45f2923c370b79b21182692493a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01a374760867db7ae2eba043a8ef12e449c627f583fceb972cb7b3542e9ded496a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0f208b31fc4df920fe0b37ed4219e29ce3167cbc07468667c5b30b17d9bda2faab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e0084017dde168203e880a0688cd0d447645cebe389750183e30c47510930275f92cdc88c051006a6e1159e8822e1f5819d584a52f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90263f901faa0efb7f759f4efeb0a3f512a223a707329d5de7a45f2923c370b79b21182692493a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01a374760867db7ae2eba043a8ef12e449c627f583fceb972cb7b3542e9ded496a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0f208b31fc4df920fe0b37ed4219e29ce3167cbc07468667c5b30b17d9bda2faab9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e0084017dde168203e880a0c800c5f513f8a9a27828c8a211c0e44df32265ba5008fde90e583cf62df40425886dbe6b4655aba779f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -475,7 +201,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9c93dce1035f96d7709a135cd20fccdc4bd11e5553bd84628b690d8f7f5f192a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2b1ee8939c73630c0f581fea0eb6539b8b46080f662d50f716515d0474f4d6d3",
+        "lastblockhash" : "0xd7c3d71a4cac513eda4f51d4b58fc2614bf765939a8fb7822fb76feac0c07154",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -548,10 +274,10 @@
     "callcallcodecallcode_ABCB_RECURSIVE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "501fd2c5860802e11a884639a6df73aae8daeb058252121c23805b66794fce18"
+            "sourceHash" : "fae72c64a29ad2b294759e55a55d4376b5b6bd9b2783f540d37a00094e41b98b"
         },
         "blocks" : [
             {
@@ -562,9 +288,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3bc",
-                    "hash" : "0xe912aede044cd636ae22d2bf1a45f51274aee30791a4ac3b34537ada9a1dc04f",
-                    "mixHash" : "0x641bf6ce08fc1c85cec24ccf2de49ff7a74cd47264e9d4d2f7716ce847883bf8",
-                    "nonce" : "0xa8f88e7915b1134f",
+                    "hash" : "0xb3873a918ee887b44284ee5281a55fb1ad491f3f5e359b9e4656a86cebd718f9",
+                    "mixHash" : "0x00fac3fea4c77e84efbb97d0d082d069dfbf4abc6187e6b7be03e2d61e9f7261",
+                    "nonce" : "0xc98b0fc6eb961d3d",
                     "number" : "0x01",
                     "parentHash" : "0xefb7f759f4efeb0a3f512a223a707329d5de7a45f2923c370b79b21182692493",
                     "receiptTrie" : "0x07a7e9621b51c06bea4f71efc197d1c5480180795d5e51229ef918badd44fb3c",
@@ -573,10 +299,10 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0efb7f759f4efeb0a3f512a223a707329d5de7a45f2923c370b79b21182692493a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06066bf08e1744bf0a3cf81c80ed7ad08bfaeae53150c4933b316fe2dfd106ad7a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a007a7e9621b51c06bea4f71efc197d1c5480180795d5e51229ef918badd44fb3cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3bc8203e880a0641bf6ce08fc1c85cec24ccf2de49ff7a74cd47264e9d4d2f7716ce847883bf888a8f88e7915b1134ff863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0efb7f759f4efeb0a3f512a223a707329d5de7a45f2923c370b79b21182692493a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06066bf08e1744bf0a3cf81c80ed7ad08bfaeae53150c4933b316fe2dfd106ad7a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a007a7e9621b51c06bea4f71efc197d1c5480180795d5e51229ef918badd44fb3cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3bc8203e880a000fac3fea4c77e84efbb97d0d082d069dfbf4abc6187e6b7be03e2d61e9f726188c98b0fc6eb961d3df863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -610,7 +336,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e9c93dce1035f96d7709a135cd20fccdc4bd11e5553bd84628b690d8f7f5f192a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe912aede044cd636ae22d2bf1a45f51274aee30791a4ac3b34537ada9a1dc04f",
+        "lastblockhash" : "0xb3873a918ee887b44284ee5281a55fb1ad491f3f5e359b9e4656a86cebd718f9",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGE_d0g0v0.json
index e1e8063eb..160a72911 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGE_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecall_10_OOGE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "24d056839a0c63202f84feb82f62207d0e6820ca4e340bce9a13cd3eea539b63"
+            "sourceHash" : "52ec5792cb2f8a24ec8ea9857088dcfd52139dadfbbed40c9ba1705a4d72f2d9"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010795",
-                    "hash" : "0x0b64322e4a1a39bae4d780bc92d949d6a946aa51e6a963aadb30f3357c2c4d68",
-                    "mixHash" : "0x8a24977a6919d711ab88d2bea091c16e63e9793497349eaf640f072ff5e818d2",
-                    "nonce" : "0xdbe73fde0ce6f262",
+                    "hash" : "0x50710ee1d70f35416c761f4f0cf13bddd850ed898cf06f92e1ab5538fede4113",
+                    "mixHash" : "0x66390e09f4923bb2bb1a93dfb9bcb2f0c5a2e0476ffc0ed41e9e113f5b9a3cf7",
+                    "nonce" : "0x23c03e076e3f8ae4",
                     "number" : "0x01",
                     "parentHash" : "0x75c99c4cbcbbae1345d048ebcb53ce70e4ce95a988d758c5fe8d09fb17716bd7",
                     "receiptTrie" : "0x24ec4468a705b1167cebec8e06ed5023585b5132b6a8a519ce17973cf79b20c8",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a075c99c4cbcbbae1345d048ebcb53ce70e4ce95a988d758c5fe8d09fb17716bd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb0c1509bfef5121fe399386dd28458eaac40a09cf19edc88598fa5b38e77560a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea024ec4468a705b1167cebec8e06ed5023585b5132b6a8a519ce17973cf79b20c8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107958203e880a08a24977a6919d711ab88d2bea091c16e63e9793497349eaf640f072ff5e818d288dbe73fde0ce6f262f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a075c99c4cbcbbae1345d048ebcb53ce70e4ce95a988d758c5fe8d09fb17716bd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0eb0c1509bfef5121fe399386dd28458eaac40a09cf19edc88598fa5b38e77560a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea024ec4468a705b1167cebec8e06ed5023585b5132b6a8a519ce17973cf79b20c8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107958203e880a066390e09f4923bb2bb1a93dfb9bcb2f0c5a2e0476ffc0ed41e9e113f5b9a3cf78823c03e076e3f8ae4f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061429a584ffbac1fa0ba5497be332cae1b6f623ca106543c9bef817bdaeabe51a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0b64322e4a1a39bae4d780bc92d949d6a946aa51e6a963aadb30f3357c2c4d68",
+        "lastblockhash" : "0x50710ee1d70f35416c761f4f0cf13bddd850ed898cf06f92e1ab5538fede4113",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -135,285 +135,13 @@
             }
         }
     },
-    "callcodecall_10_OOGE_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "24d056839a0c63202f84feb82f62207d0e6820ca4e340bce9a13cd3eea539b63"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x010795",
-                    "hash" : "0xfc2a7a6b92b7540ccbf8c32d4f816da3bb84e5eeb208c369f60a61ec536ee00b",
-                    "mixHash" : "0x9d85231eeb2b0df8b4a335ab261b284c1498760fbc8b8d9f18fcc03f5c347ddc",
-                    "nonce" : "0x8e6e376b90f92906",
-                    "number" : "0x01",
-                    "parentHash" : "0x75c99c4cbcbbae1345d048ebcb53ce70e4ce95a988d758c5fe8d09fb17716bd7",
-                    "receiptTrie" : "0x2aa8ba0b4ad16314482d629e317da4fe53feae9e104fdc9706e769ea998cde0c",
-                    "stateRoot" : "0x100d1f7a1d583b5266865da5a88c7463fe8770c3a1420a3cd35b40685c662c41",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a075c99c4cbcbbae1345d048ebcb53ce70e4ce95a988d758c5fe8d09fb17716bd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0100d1f7a1d583b5266865da5a88c7463fe8770c3a1420a3cd35b40685c662c41a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02aa8ba0b4ad16314482d629e317da4fe53feae9e104fdc9706e769ea998cde0cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107958203e880a09d85231eeb2b0df8b4a335ab261b284c1498760fbc8b8d9f18fcc03f5c347ddc888e6e376b90f92906f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x75c99c4cbcbbae1345d048ebcb53ce70e4ce95a988d758c5fe8d09fb17716bd7",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x61429a584ffbac1fa0ba5497be332cae1b6f623ca106543c9bef817bdaeabe51",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061429a584ffbac1fa0ba5497be332cae1b6f623ca106543c9bef817bdaeabe51a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfc2a7a6b92b7540ccbf8c32d4f816da3bb84e5eeb208c369f60a61ec536ee00b",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50795",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762f86b",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecall_10_OOGE_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/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "24d056839a0c63202f84feb82f62207d0e6820ca4e340bce9a13cd3eea539b63"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x010795",
-                    "hash" : "0x5a7aeb8385f17c253871a672514eb1460a1f74452f61eb4a43d5c7b451d77995",
-                    "mixHash" : "0xa5a937b742367071fb3bd8e4b3aeba114e10ef2d0c84342a11849567a8553493",
-                    "nonce" : "0x3e2873d978892aa1",
-                    "number" : "0x01",
-                    "parentHash" : "0x75c99c4cbcbbae1345d048ebcb53ce70e4ce95a988d758c5fe8d09fb17716bd7",
-                    "receiptTrie" : "0x2aa8ba0b4ad16314482d629e317da4fe53feae9e104fdc9706e769ea998cde0c",
-                    "stateRoot" : "0x100d1f7a1d583b5266865da5a88c7463fe8770c3a1420a3cd35b40685c662c41",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a075c99c4cbcbbae1345d048ebcb53ce70e4ce95a988d758c5fe8d09fb17716bd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0100d1f7a1d583b5266865da5a88c7463fe8770c3a1420a3cd35b40685c662c41a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02aa8ba0b4ad16314482d629e317da4fe53feae9e104fdc9706e769ea998cde0cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107958203e880a0a5a937b742367071fb3bd8e4b3aeba114e10ef2d0c84342a11849567a8553493883e2873d978892aa1f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x75c99c4cbcbbae1345d048ebcb53ce70e4ce95a988d758c5fe8d09fb17716bd7",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x61429a584ffbac1fa0ba5497be332cae1b6f623ca106543c9bef817bdaeabe51",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061429a584ffbac1fa0ba5497be332cae1b6f623ca106543c9bef817bdaeabe51a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5a7aeb8385f17c253871a672514eb1460a1f74452f61eb4a43d5c7b451d77995",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50795",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762f86b",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecall_10_OOGE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "24d056839a0c63202f84feb82f62207d0e6820ca4e340bce9a13cd3eea539b63"
+            "sourceHash" : "52ec5792cb2f8a24ec8ea9857088dcfd52139dadfbbed40c9ba1705a4d72f2d9"
         },
         "blocks" : [
             {
@@ -424,9 +152,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "0x1ddc3d59d4d15948d602641a97dc101e3c32431c273585756d8cd9c7ee8c6a05",
-                    "mixHash" : "0xbcd8b7c1da6a077b9b41e4f778752d9e099cb2acf40adc76ff509a6d179ef549",
-                    "nonce" : "0x72e3ae59d97403e0",
+                    "hash" : "0x9a9b27f5b8a93f670e04104566215f2f6757f996ac1e2de93297bbc70b06de5a",
+                    "mixHash" : "0x27ced59d22944e67114013517aa2517cac062c0a2854757cf2b837eb785f5828",
+                    "nonce" : "0x56a8a770c0aebbf4",
                     "number" : "0x01",
                     "parentHash" : "0x75c99c4cbcbbae1345d048ebcb53ce70e4ce95a988d758c5fe8d09fb17716bd7",
                     "receiptTrie" : "0x461e6f378992b8048edb36981c864bf890fbecb3888a63ac4b2e7ee3e3a210bc",
@@ -435,10 +163,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a075c99c4cbcbbae1345d048ebcb53ce70e4ce95a988d758c5fe8d09fb17716bd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f2f811e4d9b54ebdf5f123885706210ea8e1b3d9b9ab47c15a03f7c6b8b75802a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0461e6f378992b8048edb36981c864bf890fbecb3888a63ac4b2e7ee3e3a210bcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0bcd8b7c1da6a077b9b41e4f778752d9e099cb2acf40adc76ff509a6d179ef5498872e3ae59d97403e0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a075c99c4cbcbbae1345d048ebcb53ce70e4ce95a988d758c5fe8d09fb17716bd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f2f811e4d9b54ebdf5f123885706210ea8e1b3d9b9ab47c15a03f7c6b8b75802a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0461e6f378992b8048edb36981c864bf890fbecb3888a63ac4b2e7ee3e3a210bcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a027ced59d22944e67114013517aa2517cac062c0a2854757cf2b837eb785f58288856a8a770c0aebbf4f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -472,7 +200,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061429a584ffbac1fa0ba5497be332cae1b6f623ca106543c9bef817bdaeabe51a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1ddc3d59d4d15948d602641a97dc101e3c32431c273585756d8cd9c7ee8c6a05",
+        "lastblockhash" : "0x9a9b27f5b8a93f670e04104566215f2f6757f996ac1e2de93297bbc70b06de5a",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -541,141 +269,5 @@
                 }
             }
         }
-    },
-    "callcodecall_10_OOGE_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/stCallDelegateCodesCallCodeHomestead/callcodecall_10_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "24d056839a0c63202f84feb82f62207d0e6820ca4e340bce9a13cd3eea539b63"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x01026d",
-                    "hash" : "0x007c5bed432af21ba9fa9ad3534a8d32d9a092182424aa3c16c2104ad6349e94",
-                    "mixHash" : "0x33ab95527c5aad571dddb1c5516aa7d3d174bbcf6897c9cb4f9b4fec20acefb7",
-                    "nonce" : "0x161b62fd099a93f6",
-                    "number" : "0x01",
-                    "parentHash" : "0x75c99c4cbcbbae1345d048ebcb53ce70e4ce95a988d758c5fe8d09fb17716bd7",
-                    "receiptTrie" : "0xeed7416ca5a9e576becdfc074c203fb4bb4737d2ba25b649a8654c37bd6b4a81",
-                    "stateRoot" : "0xb5428d8a37580e1c1eb3276e523ad66f1c3fcd413011099389fd7ea28a5de0fa",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a075c99c4cbcbbae1345d048ebcb53ce70e4ce95a988d758c5fe8d09fb17716bd7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b5428d8a37580e1c1eb3276e523ad66f1c3fcd413011099389fd7ea28a5de0faa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0eed7416ca5a9e576becdfc074c203fb4bb4737d2ba25b649a8654c37bd6b4a81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301026d8203e880a033ab95527c5aad571dddb1c5516aa7d3d174bbcf6897c9cb4f9b4fec20acefb788161b62fd099a93f6f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x75c99c4cbcbbae1345d048ebcb53ce70e4ce95a988d758c5fe8d09fb17716bd7",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x61429a584ffbac1fa0ba5497be332cae1b6f623ca106543c9bef817bdaeabe51",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061429a584ffbac1fa0ba5497be332cae1b6f623ca106543c9bef817bdaeabe51a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x007c5bed432af21ba9fa9ad3534a8d32d9a092182424aa3c16c2104ad6349e94",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5026d",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762fd93",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002614e34f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEnd_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEnd_d0g0v0.json
index bc8269a60..c486b3935 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEnd_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEnd_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecall_10_SuicideEnd_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "5d22cab21bbf89eb0f62f535b8624205512e6c102c65898635121c49f1b25e6d"
+            "sourceHash" : "303eec82bfb237c295bb7e359246b247f89d512bf10a672c5b8e2f71ac47f6ad"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf7ea",
-                    "hash" : "0xc24f84a57920974e5aaf973cf3fe06acf8361944b32f91c1ba4ebfb2df52eb89",
-                    "mixHash" : "0xeb379a05e1c8d711d8ae98bd7f7edba65c9124d4fd0e66acb2515af48ff8113f",
-                    "nonce" : "0xdaa7f56b9884d09c",
+                    "hash" : "0x0d2233db691ca16841cabc445ef1d17d8ff3b8d3348f9847122869a169e9c085",
+                    "mixHash" : "0x7834bc0482b9efa563e7eafcfa4fc067905bd91ff8024f8ce2bde95cac7983de",
+                    "nonce" : "0x85f66b11c6b4ea12",
                     "number" : "0x01",
                     "parentHash" : "0x54c491deddcfe88bfefe227ae74251abce37492fcbbd4bff45202ee7d92052eb",
                     "receiptTrie" : "0x4e3cb88bd856b620a4b8bec6a168e222cc9fb69dfe0cedbc567dc2e82e7d991e",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a054c491deddcfe88bfefe227ae74251abce37492fcbbd4bff45202ee7d92052eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a40025a2fad0a206e7c5ee18d2db85cdc676675ee3e9d81e50498e53b813611da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a04e3cb88bd856b620a4b8bec6a168e222cc9fb69dfe0cedbc567dc2e82e7d991eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ea8203e880a0eb379a05e1c8d711d8ae98bd7f7edba65c9124d4fd0e66acb2515af48ff8113f88daa7f56b9884d09cf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a054c491deddcfe88bfefe227ae74251abce37492fcbbd4bff45202ee7d92052eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a40025a2fad0a206e7c5ee18d2db85cdc676675ee3e9d81e50498e53b813611da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a04e3cb88bd856b620a4b8bec6a168e222cc9fb69dfe0cedbc567dc2e82e7d991eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ea8203e880a07834bc0482b9efa563e7eafcfa4fc067905bd91ff8024f8ce2bde95cac7983de8885f66b11c6b4ea12f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02701be022e9bd263149e7844e7d97cb7d8fffb766ca525f0d4abf0d5ebe38efda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc24f84a57920974e5aaf973cf3fe06acf8361944b32f91c1ba4ebfb2df52eb89",
+        "lastblockhash" : "0x0d2233db691ca16841cabc445ef1d17d8ff3b8d3348f9847122869a169e9c085",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -127,269 +127,13 @@
             }
         }
     },
-    "callcodecall_10_SuicideEnd_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "5d22cab21bbf89eb0f62f535b8624205512e6c102c65898635121c49f1b25e6d"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf7ea",
-                    "hash" : "0x53360e104aeb56803f94f147c279608bb480c763c4bd5f891b624f4d16013fdb",
-                    "mixHash" : "0x877c82cfc59bfeb830f7e50a026ac90ba50856befa9058ead021a956cc4b4ec2",
-                    "nonce" : "0x837a13423398590c",
-                    "number" : "0x01",
-                    "parentHash" : "0x54c491deddcfe88bfefe227ae74251abce37492fcbbd4bff45202ee7d92052eb",
-                    "receiptTrie" : "0x62e004375e70eaa0213b0a93d2d212e9805a22a8135c4a01b6ad425ba5f14573",
-                    "stateRoot" : "0x14e957188c172482966f60c875196e42bed2dd73d5e4af2aa4c940ba9d593049",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a054c491deddcfe88bfefe227ae74251abce37492fcbbd4bff45202ee7d92052eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa014e957188c172482966f60c875196e42bed2dd73d5e4af2aa4c940ba9d593049a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a062e004375e70eaa0213b0a93d2d212e9805a22a8135c4a01b6ad425ba5f14573b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ea8203e880a0877c82cfc59bfeb830f7e50a026ac90ba50856befa9058ead021a956cc4b4ec288837a13423398590cf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x54c491deddcfe88bfefe227ae74251abce37492fcbbd4bff45202ee7d92052eb",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x2701be022e9bd263149e7844e7d97cb7d8fffb766ca525f0d4abf0d5ebe38efd",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02701be022e9bd263149e7844e7d97cb7d8fffb766ca525f0d4abf0d5ebe38efda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x53360e104aeb56803f94f147c279608bb480c763c4bd5f891b624f4d16013fdb",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f7ea",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7630816",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecall_10_SuicideEnd_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/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "5d22cab21bbf89eb0f62f535b8624205512e6c102c65898635121c49f1b25e6d"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf7ea",
-                    "hash" : "0x1fee00e92d8142fe631403f5469184666f222d33b07e0eb69249463def3fe973",
-                    "mixHash" : "0x3f745d1d0456c6fb934d2d99adfc88f8022031c55ee611313405646bf4d3820b",
-                    "nonce" : "0x6bdadd3051a45974",
-                    "number" : "0x01",
-                    "parentHash" : "0x54c491deddcfe88bfefe227ae74251abce37492fcbbd4bff45202ee7d92052eb",
-                    "receiptTrie" : "0x62e004375e70eaa0213b0a93d2d212e9805a22a8135c4a01b6ad425ba5f14573",
-                    "stateRoot" : "0x14e957188c172482966f60c875196e42bed2dd73d5e4af2aa4c940ba9d593049",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a054c491deddcfe88bfefe227ae74251abce37492fcbbd4bff45202ee7d92052eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa014e957188c172482966f60c875196e42bed2dd73d5e4af2aa4c940ba9d593049a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a062e004375e70eaa0213b0a93d2d212e9805a22a8135c4a01b6ad425ba5f14573b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7ea8203e880a03f745d1d0456c6fb934d2d99adfc88f8022031c55ee611313405646bf4d3820b886bdadd3051a45974f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x54c491deddcfe88bfefe227ae74251abce37492fcbbd4bff45202ee7d92052eb",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x2701be022e9bd263149e7844e7d97cb7d8fffb766ca525f0d4abf0d5ebe38efd",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02701be022e9bd263149e7844e7d97cb7d8fffb766ca525f0d4abf0d5ebe38efda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1fee00e92d8142fe631403f5469184666f222d33b07e0eb69249463def3fe973",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f7ea",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7630816",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecall_10_SuicideEnd_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "5d22cab21bbf89eb0f62f535b8624205512e6c102c65898635121c49f1b25e6d"
+            "sourceHash" : "303eec82bfb237c295bb7e359246b247f89d512bf10a672c5b8e2f71ac47f6ad"
         },
         "blocks" : [
             {
@@ -400,9 +144,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0xcf7b9555548d0c550109767ff7c1fd97319acc3c8bab55b8794ea4bd1ee85dd7",
-                    "mixHash" : "0x8c03eef3f1cfcbc4f06b80e46280c6a2bf9613d69759261bbe2229740e332234",
-                    "nonce" : "0xf9af072db8979fa4",
+                    "hash" : "0x730d1f1639081b627becf7808ae4d40ad117de46f0b1103db7e68cc0a01d39b2",
+                    "mixHash" : "0x124a69f84b54079025f8004b7caa4618b6a7698c5043b8e2fd5f791abdd803cf",
+                    "nonce" : "0x371a715ead06b6cb",
                     "number" : "0x01",
                     "parentHash" : "0x54c491deddcfe88bfefe227ae74251abce37492fcbbd4bff45202ee7d92052eb",
                     "receiptTrie" : "0x7cd21e4aed8476add0fba5d5bdb8dc2cc4665159047c3959a8539167d6e89846",
@@ -411,10 +155,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a054c491deddcfe88bfefe227ae74251abce37492fcbbd4bff45202ee7d92052eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa078969b837e22eb4a31bf2e04aeaa880a91ba1c45d047a5d0c99ffb63f2d9f0d5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a07cd21e4aed8476add0fba5d5bdb8dc2cc4665159047c3959a8539167d6e89846b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a08c03eef3f1cfcbc4f06b80e46280c6a2bf9613d69759261bbe2229740e33223488f9af072db8979fa4f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a054c491deddcfe88bfefe227ae74251abce37492fcbbd4bff45202ee7d92052eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa078969b837e22eb4a31bf2e04aeaa880a91ba1c45d047a5d0c99ffb63f2d9f0d5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a07cd21e4aed8476add0fba5d5bdb8dc2cc4665159047c3959a8539167d6e89846b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0124a69f84b54079025f8004b7caa4618b6a7698c5043b8e2fd5f791abdd803cf88371a715ead06b6cbf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -448,7 +192,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02701be022e9bd263149e7844e7d97cb7d8fffb766ca525f0d4abf0d5ebe38efda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcf7b9555548d0c550109767ff7c1fd97319acc3c8bab55b8794ea4bd1ee85dd7",
+        "lastblockhash" : "0x730d1f1639081b627becf7808ae4d40ad117de46f0b1103db7e68cc0a01d39b2",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -517,133 +261,5 @@
                 }
             }
         }
-    },
-    "callcodecall_10_SuicideEnd_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/stCallDelegateCodesCallCodeHomestead/callcodecall_10_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "5d22cab21bbf89eb0f62f535b8624205512e6c102c65898635121c49f1b25e6d"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xdf3a",
-                    "hash" : "0xfc53aab73339401922e51c92b14a357538a799a681500ce635c414a97efab008",
-                    "mixHash" : "0x845a8ccdd1d84452c198d90fa40618d58a8b2d4e41052702fdcead5032eeed01",
-                    "nonce" : "0xbe0b26230558bea7",
-                    "number" : "0x01",
-                    "parentHash" : "0x54c491deddcfe88bfefe227ae74251abce37492fcbbd4bff45202ee7d92052eb",
-                    "receiptTrie" : "0x38b1943273dfd1d177785f1a838ebbca239a11df43b71985a3944a8bbfabdeed",
-                    "stateRoot" : "0x82e335f420788d920491324e218dc75b9d3581e3d6f37c9f48bdb78c7eccffc7",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a054c491deddcfe88bfefe227ae74251abce37492fcbbd4bff45202ee7d92052eba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa082e335f420788d920491324e218dc75b9d3581e3d6f37c9f48bdb78c7eccffc7a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a038b1943273dfd1d177785f1a838ebbca239a11df43b71985a3944a8bbfabdeedb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df3a8203e880a0845a8ccdd1d84452c198d90fa40618d58a8b2d4e41052702fdcead5032eeed0188be0b26230558bea7f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x54c491deddcfe88bfefe227ae74251abce37492fcbbd4bff45202ee7d92052eb",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x2701be022e9bd263149e7844e7d97cb7d8fffb766ca525f0d4abf0d5ebe38efd",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02701be022e9bd263149e7844e7d97cb7d8fffb766ca525f0d4abf0d5ebe38efda056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfc53aab73339401922e51c92b14a357538a799a681500ce635c414a97efab008",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4df3a",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76320c6",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000261c350f2600155731000000000000000000000000000000000000000ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_d0g0v0.json
index 7660a3123..4159b4684 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecall_10_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_d0g0v0Filler.json",
-            "sourceHash" : "ef0a524551ef5924d70b1bdba1ae603c54197fc266c6969eff916d9c96d8cb25"
+            "sourceHash" : "cace55fe05da7646bea52be94c9d4782254e5910d80efb2057cfb06f574223d2"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x037f4e",
-                    "hash" : "0x9f29560bff662ce167f80be3a76c32f0fcefa954058640d2c5eac20471f7969b",
-                    "mixHash" : "0xa7ca1e160812e5e8ab6a61ff6f711e885dd197263a25c299e50302d27671acc2",
-                    "nonce" : "0x255b63d7037be95a",
+                    "hash" : "0x94e128346ad2023febaf473f29e12c62c6700f696fb2df907cb4eb5710d00e31",
+                    "mixHash" : "0x11f6306bef2c5edf6b76ebe0f98b1bcc6c92711cd08b5ec56941c5e85d715f6b",
+                    "nonce" : "0x45192db00d3aba2c",
                     "number" : "0x01",
                     "parentHash" : "0x864c24e4b090f78b7a51951d634e3d75e0981b85198abd82c821e5172ab62153",
                     "receiptTrie" : "0xb2b164f9345de5f7d05d32391c8f56a1dd4f57b4e93aef2849a559b23685f748",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0864c24e4b090f78b7a51951d634e3d75e0981b85198abd82c821e5172ab62153a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8f5feaa823f645574a456eaf85461b270e7fe21fb86ddce52a9f3facf5b3e64a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0b2b164f9345de5f7d05d32391c8f56a1dd4f57b4e93aef2849a559b23685f748b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083037f4e8203e880a0a7ca1e160812e5e8ab6a61ff6f711e885dd197263a25c299e50302d27671acc288255b63d7037be95af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0864c24e4b090f78b7a51951d634e3d75e0981b85198abd82c821e5172ab62153a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c8f5feaa823f645574a456eaf85461b270e7fe21fb86ddce52a9f3facf5b3e64a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0b2b164f9345de5f7d05d32391c8f56a1dd4f57b4e93aef2849a559b23685f748b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083037f4e8203e880a011f6306bef2c5edf6b76ebe0f98b1bcc6c92711cd08b5ec56941c5e85d715f6b8845192db00d3aba2cf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089659b79b9756ecf3e96e7e9e65afd8410936f4428e64b270c109c9598dbd504a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9f29560bff662ce167f80be3a76c32f0fcefa954058640d2c5eac20471f7969b",
+        "lastblockhash" : "0x94e128346ad2023febaf473f29e12c62c6700f696fb2df907cb4eb5710d00e31",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -144,303 +144,13 @@
             }
         }
     },
-    "callcodecall_10_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_d0g0v0Filler.json",
-            "sourceHash" : "ef0a524551ef5924d70b1bdba1ae603c54197fc266c6969eff916d9c96d8cb25"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x037f4e",
-                    "hash" : "0x87e690a2ef5d819bbc0094936bfc40ca12558f414f3a27b81cc48e036480bcc0",
-                    "mixHash" : "0x6209b33cdf561fa3e6eca1b312c2a34da54013e9beff7b4777ddcf0bfcc96c31",
-                    "nonce" : "0x56db61e4a300b766",
-                    "number" : "0x01",
-                    "parentHash" : "0x864c24e4b090f78b7a51951d634e3d75e0981b85198abd82c821e5172ab62153",
-                    "receiptTrie" : "0xff6d62538121b8283c9066bd7073be81e95562232e4c3aa619cf0f586f090339",
-                    "stateRoot" : "0x76a02df274bc50a99823189766d293200756413127f066d67483d743dc7b806e",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0864c24e4b090f78b7a51951d634e3d75e0981b85198abd82c821e5172ab62153a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076a02df274bc50a99823189766d293200756413127f066d67483d743dc7b806ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0ff6d62538121b8283c9066bd7073be81e95562232e4c3aa619cf0f586f090339b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083037f4e8203e880a06209b33cdf561fa3e6eca1b312c2a34da54013e9beff7b4777ddcf0bfcc96c318856db61e4a300b766f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x864c24e4b090f78b7a51951d634e3d75e0981b85198abd82c821e5172ab62153",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x89659b79b9756ecf3e96e7e9e65afd8410936f4428e64b270c109c9598dbd504",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089659b79b9756ecf3e96e7e9e65afd8410936f4428e64b270c109c9598dbd504a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x87e690a2ef5d819bbc0094936bfc40ca12558f414f3a27b81cc48e036480bcc0",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x02" : "0x01",
-                    "0x04" : "0x1000000000000000000000000000000000000000",
-                    "0x05" : "0x02",
-                    "0xe6" : "0x1000000000000000000000000000000000000000",
-                    "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0xec" : "0x40",
-                    "0xee" : "0x21",
-                    "0xf0" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160025533600455346005553060e6553260e8553660ec553860ee553a60f055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f77f4e",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76080b2",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160025533600455346005553060e6553260e8553660ec553860ee553a60f055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecall_10_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/stCallDelegateCodesCallCodeHomestead/callcodecall_10_d0g0v0Filler.json",
-            "sourceHash" : "ef0a524551ef5924d70b1bdba1ae603c54197fc266c6969eff916d9c96d8cb25"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x037f4e",
-                    "hash" : "0x6bd9f12c3f67eca2631a7cf7fe89d9f0558a8d4179f829676e11838dd19643b0",
-                    "mixHash" : "0x1b83703c6724464bf24990c175e8b107f92f65cb9a3eaff847411cce7bc2284c",
-                    "nonce" : "0x033f66bc009a4b52",
-                    "number" : "0x01",
-                    "parentHash" : "0x864c24e4b090f78b7a51951d634e3d75e0981b85198abd82c821e5172ab62153",
-                    "receiptTrie" : "0xff6d62538121b8283c9066bd7073be81e95562232e4c3aa619cf0f586f090339",
-                    "stateRoot" : "0x76a02df274bc50a99823189766d293200756413127f066d67483d743dc7b806e",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0864c24e4b090f78b7a51951d634e3d75e0981b85198abd82c821e5172ab62153a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa076a02df274bc50a99823189766d293200756413127f066d67483d743dc7b806ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0ff6d62538121b8283c9066bd7073be81e95562232e4c3aa619cf0f586f090339b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083037f4e8203e880a01b83703c6724464bf24990c175e8b107f92f65cb9a3eaff847411cce7bc2284c88033f66bc009a4b52f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x864c24e4b090f78b7a51951d634e3d75e0981b85198abd82c821e5172ab62153",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x89659b79b9756ecf3e96e7e9e65afd8410936f4428e64b270c109c9598dbd504",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089659b79b9756ecf3e96e7e9e65afd8410936f4428e64b270c109c9598dbd504a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6bd9f12c3f67eca2631a7cf7fe89d9f0558a8d4179f829676e11838dd19643b0",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x02" : "0x01",
-                    "0x04" : "0x1000000000000000000000000000000000000000",
-                    "0x05" : "0x02",
-                    "0xe6" : "0x1000000000000000000000000000000000000000",
-                    "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0xec" : "0x40",
-                    "0xee" : "0x21",
-                    "0xf0" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160025533600455346005553060e6553260e8553660ec553860ee553a60f055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f77f4e",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76080b2",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160025533600455346005553060e6553260e8553660ec553860ee553a60f055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecall_10_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecall_10_d0g0v0Filler.json",
-            "sourceHash" : "ef0a524551ef5924d70b1bdba1ae603c54197fc266c6969eff916d9c96d8cb25"
+            "sourceHash" : "cace55fe05da7646bea52be94c9d4782254e5910d80efb2057cfb06f574223d2"
         },
         "blocks" : [
             {
@@ -451,9 +161,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x823090ebda40afbc38e67ce374f826b7724cd1201890c3d7e80ff7abf2c9646f",
-                    "mixHash" : "0x68ad6d5fbb330e0f256a2008723a6fbc7dffbf3e9a3186418f634e9cba17a2e3",
-                    "nonce" : "0xd5ff5e87798af699",
+                    "hash" : "0xf7764eee574fcb08baecc98d0cb3eec93ef2664f849bc614123b0cd8c55e98cf",
+                    "mixHash" : "0xfb00fe0cf69ed62151e967f299f7e9131cf030e58cd765cd05555d838ec56e4b",
+                    "nonce" : "0x27fa9fd199d04bed",
                     "number" : "0x01",
                     "parentHash" : "0x864c24e4b090f78b7a51951d634e3d75e0981b85198abd82c821e5172ab62153",
                     "receiptTrie" : "0xe50bb1bd4b26b68201bee1107eab2f14b387337f4aa6f16cf5dee350c8cb7947",
@@ -462,10 +172,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0864c24e4b090f78b7a51951d634e3d75e0981b85198abd82c821e5172ab62153a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094351667ac618490fc5dd619cdca5dcfd47eb4e390f02b7e3ce1b644e1c0e931a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e50bb1bd4b26b68201bee1107eab2f14b387337f4aa6f16cf5dee350c8cb7947b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a068ad6d5fbb330e0f256a2008723a6fbc7dffbf3e9a3186418f634e9cba17a2e388d5ff5e87798af699f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0864c24e4b090f78b7a51951d634e3d75e0981b85198abd82c821e5172ab62153a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094351667ac618490fc5dd619cdca5dcfd47eb4e390f02b7e3ce1b644e1c0e931a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e50bb1bd4b26b68201bee1107eab2f14b387337f4aa6f16cf5dee350c8cb7947b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0fb00fe0cf69ed62151e967f299f7e9131cf030e58cd765cd05555d838ec56e4b8827fa9fd199d04bedf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -499,7 +209,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089659b79b9756ecf3e96e7e9e65afd8410936f4428e64b270c109c9598dbd504a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x823090ebda40afbc38e67ce374f826b7724cd1201890c3d7e80ff7abf2c9646f",
+        "lastblockhash" : "0xf7764eee574fcb08baecc98d0cb3eec93ef2664f849bc614123b0cd8c55e98cf",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -568,150 +278,5 @@
                 }
             }
         }
-    },
-    "callcodecall_10_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/stCallDelegateCodesCallCodeHomestead/callcodecall_10_d0g0v0Filler.json",
-            "sourceHash" : "ef0a524551ef5924d70b1bdba1ae603c54197fc266c6969eff916d9c96d8cb25"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x037a26",
-                    "hash" : "0x9cba21d6a784906f70b7d49de5f1c3d27651c6fb489edcdfeef3e2a5286e0198",
-                    "mixHash" : "0xbffecab82198f097e80619077a2de40e1e0afdeb2f617d03893462176da8efa2",
-                    "nonce" : "0x6ea0c2d821725c62",
-                    "number" : "0x01",
-                    "parentHash" : "0x864c24e4b090f78b7a51951d634e3d75e0981b85198abd82c821e5172ab62153",
-                    "receiptTrie" : "0x2ef020f776b0d9fafd1f458db0f6cb370dec55ddd37bbff08b646428d57dedcf",
-                    "stateRoot" : "0x2046283f2c8cb21a196eb7255a8d81219cf836e2bb1a74ab89207afb97cc17ef",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0864c24e4b090f78b7a51951d634e3d75e0981b85198abd82c821e5172ab62153a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02046283f2c8cb21a196eb7255a8d81219cf836e2bb1a74ab89207afb97cc17efa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a02ef020f776b0d9fafd1f458db0f6cb370dec55ddd37bbff08b646428d57dedcfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083037a268203e880a0bffecab82198f097e80619077a2de40e1e0afdeb2f617d03893462176da8efa2886ea0c2d821725c62f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x864c24e4b090f78b7a51951d634e3d75e0981b85198abd82c821e5172ab62153",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x89659b79b9756ecf3e96e7e9e65afd8410936f4428e64b270c109c9598dbd504",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089659b79b9756ecf3e96e7e9e65afd8410936f4428e64b270c109c9598dbd504a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9cba21d6a784906f70b7d49de5f1c3d27651c6fb489edcdfeef3e2a5286e0198",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x02" : "0x01",
-                    "0x04" : "0x1000000000000000000000000000000000000000",
-                    "0x05" : "0x02",
-                    "0xe6" : "0x1000000000000000000000000000000000000000",
-                    "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0xec" : "0x40",
-                    "0xee" : "0x21",
-                    "0xf0" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160025533600455346005553060e6553260e8553660ec553860ee553a60f055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f77a26",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76085da",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060027310000000000000000000000000000000000000026203d090f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160025533600455346005553060e6553260e8553660ec553860ee553a60f055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGE_d0g0v0.json
index b947afba7..b9f5c3929 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGE_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_OOGE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "edcc781718f73dc94a7f38be773bc033a41441bc0c7d7b7d961071203b13b5cf"
+            "sourceHash" : "cec412c70650161bbb441335d38f4a384a760dd7dc0bc0273c343dd34ccb4d86"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x01588f",
-                    "hash" : "0x21f30190a491ddc832981e8d11bdd57712ed6d474856f96da74f6f69591f56c9",
-                    "mixHash" : "0x40c113eaee48214d9a50eecba7db6f3626338b17821e96e690434254b58e669e",
-                    "nonce" : "0xd212a5f9e0ed64ae",
+                    "hash" : "0x01041b7e00119466799fa53c106e36dac28de36c20d09e932e99bb1b6f2090a5",
+                    "mixHash" : "0x450893a926755dbc64ee8a3f30cd2922db6ef38e8fee45922445f7f5d1b0d8a7",
+                    "nonce" : "0x8073f99e0a763831",
                     "number" : "0x01",
                     "parentHash" : "0x0b4c28e92094535608c94c66ee1c0e63e61790a86907cfa19d84023a0330f4cc",
                     "receiptTrie" : "0xf6d95b316df534ca539b32cd7d1efee460a09707e8daebacc70c1f459983a61a",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00b4c28e92094535608c94c66ee1c0e63e61790a86907cfa19d84023a0330f4cca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083d9ee488857f39d710640d3b08f3f1e97a175720fae15eb4063068373a3deb6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f6d95b316df534ca539b32cd7d1efee460a09707e8daebacc70c1f459983a61ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301588f8203e880a040c113eaee48214d9a50eecba7db6f3626338b17821e96e690434254b58e669e88d212a5f9e0ed64aef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00b4c28e92094535608c94c66ee1c0e63e61790a86907cfa19d84023a0330f4cca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083d9ee488857f39d710640d3b08f3f1e97a175720fae15eb4063068373a3deb6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f6d95b316df534ca539b32cd7d1efee460a09707e8daebacc70c1f459983a61ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301588f8203e880a0450893a926755dbc64ee8a3f30cd2922db6ef38e8fee45922445f7f5d1b0d8a7888073f99e0a763831f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0db0c91c4fcf83f26d5107522dcf24f1717dcdee5e7d3169770daaa6cfd654de7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x21f30190a491ddc832981e8d11bdd57712ed6d474856f96da74f6f69591f56c9",
+        "lastblockhash" : "0x01041b7e00119466799fa53c106e36dac28de36c20d09e932e99bb1b6f2090a5",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -150,315 +150,13 @@
             }
         }
     },
-    "callcodecallcall_100_OOGE_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "edcc781718f73dc94a7f38be773bc033a41441bc0c7d7b7d961071203b13b5cf"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x01588f",
-                    "hash" : "0xf58469e3f1fd6e60cb796d2718d07785fa99f5e8657abcaedcae915f9dd6faab",
-                    "mixHash" : "0x162bec039256d311c7f6ee0bdeb17faa74e13b2d97cf98d8e9b5081b9ad26312",
-                    "nonce" : "0x5f00354c24ab67d4",
-                    "number" : "0x01",
-                    "parentHash" : "0x0b4c28e92094535608c94c66ee1c0e63e61790a86907cfa19d84023a0330f4cc",
-                    "receiptTrie" : "0xe580ce0af3228e1553c01f3a3d1654ce2b419b4b7bb2f68e6a6e369cc222ae68",
-                    "stateRoot" : "0x20a37072c263ecefc407fe447b49d4965690cfc822b2f3dd425a94bf25bf3766",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a00b4c28e92094535608c94c66ee1c0e63e61790a86907cfa19d84023a0330f4cca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa020a37072c263ecefc407fe447b49d4965690cfc822b2f3dd425a94bf25bf3766a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e580ce0af3228e1553c01f3a3d1654ce2b419b4b7bb2f68e6a6e369cc222ae68b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301588f8203e880a0162bec039256d311c7f6ee0bdeb17faa74e13b2d97cf98d8e9b5081b9ad26312885f00354c24ab67d4f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x0b4c28e92094535608c94c66ee1c0e63e61790a86907cfa19d84023a0330f4cc",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xdb0c91c4fcf83f26d5107522dcf24f1717dcdee5e7d3169770daaa6cfd654de7",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0db0c91c4fcf83f26d5107522dcf24f1717dcdee5e7d3169770daaa6cfd654de7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf58469e3f1fd6e60cb796d2718d07785fa99f5e8657abcaedcae915f9dd6faab",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5588f",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762a771",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcall_100_OOGE_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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "edcc781718f73dc94a7f38be773bc033a41441bc0c7d7b7d961071203b13b5cf"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x01588f",
-                    "hash" : "0x7bfc9afef61384a1c02848ad746f9a5110d3e4c0ec5a34da3f58973a94d7cb1a",
-                    "mixHash" : "0xdc223d2c7cb110a021af0de960519a3206648111674a7c9fc4a5c76ee40df3ff",
-                    "nonce" : "0xac0b3ccb9863d91e",
-                    "number" : "0x01",
-                    "parentHash" : "0x0b4c28e92094535608c94c66ee1c0e63e61790a86907cfa19d84023a0330f4cc",
-                    "receiptTrie" : "0xe580ce0af3228e1553c01f3a3d1654ce2b419b4b7bb2f68e6a6e369cc222ae68",
-                    "stateRoot" : "0x20a37072c263ecefc407fe447b49d4965690cfc822b2f3dd425a94bf25bf3766",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a00b4c28e92094535608c94c66ee1c0e63e61790a86907cfa19d84023a0330f4cca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa020a37072c263ecefc407fe447b49d4965690cfc822b2f3dd425a94bf25bf3766a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e580ce0af3228e1553c01f3a3d1654ce2b419b4b7bb2f68e6a6e369cc222ae68b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301588f8203e880a0dc223d2c7cb110a021af0de960519a3206648111674a7c9fc4a5c76ee40df3ff88ac0b3ccb9863d91ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x0b4c28e92094535608c94c66ee1c0e63e61790a86907cfa19d84023a0330f4cc",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xdb0c91c4fcf83f26d5107522dcf24f1717dcdee5e7d3169770daaa6cfd654de7",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0db0c91c4fcf83f26d5107522dcf24f1717dcdee5e7d3169770daaa6cfd654de7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7bfc9afef61384a1c02848ad746f9a5110d3e4c0ec5a34da3f58973a94d7cb1a",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5588f",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762a771",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcall_100_OOGE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "edcc781718f73dc94a7f38be773bc033a41441bc0c7d7b7d961071203b13b5cf"
+            "sourceHash" : "cec412c70650161bbb441335d38f4a384a760dd7dc0bc0273c343dd34ccb4d86"
         },
         "blocks" : [
             {
@@ -469,9 +167,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "0x5bfd2551c51197796a66f36fdcd989af2c0cec23631e1cef649c199ecd4fbe8a",
-                    "mixHash" : "0xd093b9641380873665b4aa31e8cbc195f697e644a24e62c6da987d55f0d9e909",
-                    "nonce" : "0xc0d5e07d30614f1d",
+                    "hash" : "0x80f270363fb835c4b86d2a5cdaf87696a0f15035f59d59417ceb01f7df64d6a7",
+                    "mixHash" : "0x41e71efa6acda0bf9ddd4b7cc0273e07a21b25b8897b8c1d99d9668369cf1087",
+                    "nonce" : "0x529b9f9e61e80375",
                     "number" : "0x01",
                     "parentHash" : "0x0b4c28e92094535608c94c66ee1c0e63e61790a86907cfa19d84023a0330f4cc",
                     "receiptTrie" : "0xc3362fd6376caaee0c62a7e681a8f258dbe86a1ee1b282e3dad16472b500bb17",
@@ -480,10 +178,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a00b4c28e92094535608c94c66ee1c0e63e61790a86907cfa19d84023a0330f4cca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0486d935d0e8a1a06f23d6e303e214cca2fbea94a34a92cf9da80497a17b8debea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c3362fd6376caaee0c62a7e681a8f258dbe86a1ee1b282e3dad16472b500bb17b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0d093b9641380873665b4aa31e8cbc195f697e644a24e62c6da987d55f0d9e90988c0d5e07d30614f1df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a00b4c28e92094535608c94c66ee1c0e63e61790a86907cfa19d84023a0330f4cca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0486d935d0e8a1a06f23d6e303e214cca2fbea94a34a92cf9da80497a17b8debea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c3362fd6376caaee0c62a7e681a8f258dbe86a1ee1b282e3dad16472b500bb17b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a041e71efa6acda0bf9ddd4b7cc0273e07a21b25b8897b8c1d99d9668369cf108788529b9f9e61e80375f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -517,7 +215,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0db0c91c4fcf83f26d5107522dcf24f1717dcdee5e7d3169770daaa6cfd654de7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5bfd2551c51197796a66f36fdcd989af2c0cec23631e1cef649c199ecd4fbe8a",
+        "lastblockhash" : "0x80f270363fb835c4b86d2a5cdaf87696a0f15035f59d59417ceb01f7df64d6a7",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -600,156 +298,5 @@
                 }
             }
         }
-    },
-    "callcodecallcall_100_OOGE_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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "edcc781718f73dc94a7f38be773bc033a41441bc0c7d7b7d961071203b13b5cf"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150d3",
-                    "hash" : "0x3a0a76bffca7e10ac1d363bf6ac96dc2268027eb47932ff4a15282a67bec3b17",
-                    "mixHash" : "0xf642bf7df52a7d2b9693c09b0c8a66e253e7c91c4c660aeebca00f63ff4fca02",
-                    "nonce" : "0xf53edc89df221203",
-                    "number" : "0x01",
-                    "parentHash" : "0x0b4c28e92094535608c94c66ee1c0e63e61790a86907cfa19d84023a0330f4cc",
-                    "receiptTrie" : "0x85a5dd5ab28d5aada417f7ae08dcef2fb827fc1ea726c0cf5d9b7e147ba262a9",
-                    "stateRoot" : "0x9f6820a0c6a0c58242665fe4c8c8fb7a7195514918ff06606af10cf2902a50d1",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a00b4c28e92094535608c94c66ee1c0e63e61790a86907cfa19d84023a0330f4cca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09f6820a0c6a0c58242665fe4c8c8fb7a7195514918ff06606af10cf2902a50d1a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea085a5dd5ab28d5aada417f7ae08dcef2fb827fc1ea726c0cf5d9b7e147ba262a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d38203e880a0f642bf7df52a7d2b9693c09b0c8a66e253e7c91c4c660aeebca00f63ff4fca0288f53edc89df221203f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x0b4c28e92094535608c94c66ee1c0e63e61790a86907cfa19d84023a0330f4cc",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xdb0c91c4fcf83f26d5107522dcf24f1717dcdee5e7d3169770daaa6cfd654de7",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0db0c91c4fcf83f26d5107522dcf24f1717dcdee5e7d3169770daaa6cfd654de7a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3a0a76bffca7e10ac1d363bf6ac96dc2268027eb47932ff4a15282a67bec3b17",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550d3",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af2d",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfter_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfter_d0g0v0.json
index fccfbd3d8..831f670a7 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfter_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfter_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "1d02eaa67617cb04f477d5d642fe0a091887e5d95c7e5feee3d061047355d81d"
+            "sourceHash" : "342205cff5fdc5eeb736cb0f9e3587a88c9b6ecf6e92674ff58c97be57840992"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155ff",
-                    "hash" : "0xdcbd347ae5b399824d7971eb7656f63637528bd7e3409341353a1a6efa498353",
-                    "mixHash" : "0x2d2a5f71a8190723f2c75b6df35af784ee4cee2e24cfd2d4d12b3c2ba06be577",
-                    "nonce" : "0xfc521d7d86b4c496",
+                    "hash" : "0x1f743af6fa67100e9f844a3e148cd9efb8316d8ddee0304f577c86fa6e5ff742",
+                    "mixHash" : "0x1bbcbb5491c9dd20c9b52f3131ea51a18ea776326ef85eb7ae7073fe9ea65700",
+                    "nonce" : "0x1598fe85a7bcb933",
                     "number" : "0x01",
                     "parentHash" : "0x4166ac1f85b016cceae952ae56a48f1164de49df7e0ba8600d41a62bffa8d2bb",
                     "receiptTrie" : "0x904ef34262912ab9ed82ebe8efcc7e7d10f885cb2a54713e6772e69cbee8b33c",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a04166ac1f85b016cceae952ae56a48f1164de49df7e0ba8600d41a62bffa8d2bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa026959f2e9d2862966c446c42e01b06b26de649452cd024968812bc087db9d9e8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0904ef34262912ab9ed82ebe8efcc7e7d10f885cb2a54713e6772e69cbee8b33cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155ff8203e880a02d2a5f71a8190723f2c75b6df35af784ee4cee2e24cfd2d4d12b3c2ba06be57788fc521d7d86b4c496f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a04166ac1f85b016cceae952ae56a48f1164de49df7e0ba8600d41a62bffa8d2bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa026959f2e9d2862966c446c42e01b06b26de649452cd024968812bc087db9d9e8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0904ef34262912ab9ed82ebe8efcc7e7d10f885cb2a54713e6772e69cbee8b33cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155ff8203e880a01bbcbb5491c9dd20c9b52f3131ea51a18ea776326ef85eb7ae7073fe9ea65700881598fe85a7bcb933f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5555f63b1e84328b4c33bcf3684b9c00f89427419b291c48f154d08f977cbcfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdcbd347ae5b399824d7971eb7656f63637528bd7e3409341353a1a6efa498353",
+        "lastblockhash" : "0x1f743af6fa67100e9f844a3e148cd9efb8316d8ddee0304f577c86fa6e5ff742",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -149,462 +149,13 @@
             }
         }
     },
-    "callcodecallcall_100_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "1d02eaa67617cb04f477d5d642fe0a091887e5d95c7e5feee3d061047355d81d"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155ff",
-                    "hash" : "0x15f98b449dc71f110443af67fa7df987ac8dd8ad93a5e2e3f2aab9a354f3da29",
-                    "mixHash" : "0xdd7944c381073c159c1088391fd11bfc1be9cfe14882a2e94035885c7869be62",
-                    "nonce" : "0x25aa5b492dca51c6",
-                    "number" : "0x01",
-                    "parentHash" : "0x4166ac1f85b016cceae952ae56a48f1164de49df7e0ba8600d41a62bffa8d2bb",
-                    "receiptTrie" : "0xaf03afeaa2c9d90f1ab72fbf556b355b4fb802f3c847ff3009f8ca25fc19c674",
-                    "stateRoot" : "0xb9c293f18a902d508ce77fbf62190970cdd4363aca72cf692bfad55895ba8758",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a04166ac1f85b016cceae952ae56a48f1164de49df7e0ba8600d41a62bffa8d2bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b9c293f18a902d508ce77fbf62190970cdd4363aca72cf692bfad55895ba8758a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0af03afeaa2c9d90f1ab72fbf556b355b4fb802f3c847ff3009f8ca25fc19c674b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155ff8203e880a0dd7944c381073c159c1088391fd11bfc1be9cfe14882a2e94035885c7869be628825aa5b492dca51c6f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x4166ac1f85b016cceae952ae56a48f1164de49df7e0ba8600d41a62bffa8d2bb",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xd5555f63b1e84328b4c33bcf3684b9c00f89427419b291c48f154d08f977cbcf",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5555f63b1e84328b4c33bcf3684b9c00f89427419b291c48f154d08f977cbcfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x15f98b449dc71f110443af67fa7df987ac8dd8ad93a5e2e3f2aab9a354f3da29",
-        "network" : "EIP150",
-        "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_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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "1d02eaa67617cb04f477d5d642fe0a091887e5d95c7e5feee3d061047355d81d"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155ff",
-                    "hash" : "0x782c2dae2f83275939d262ff39cd0a8738f0299e004132f0bee12ebd82be7260",
-                    "mixHash" : "0x8873fe39538eeb066d3867b402c3d5dbc8bf65bc1884ac978ba73bc19e42266f",
-                    "nonce" : "0xd2be8b8c27b65d9a",
-                    "number" : "0x01",
-                    "parentHash" : "0x4166ac1f85b016cceae952ae56a48f1164de49df7e0ba8600d41a62bffa8d2bb",
-                    "receiptTrie" : "0xaf03afeaa2c9d90f1ab72fbf556b355b4fb802f3c847ff3009f8ca25fc19c674",
-                    "stateRoot" : "0xb9c293f18a902d508ce77fbf62190970cdd4363aca72cf692bfad55895ba8758",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a04166ac1f85b016cceae952ae56a48f1164de49df7e0ba8600d41a62bffa8d2bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b9c293f18a902d508ce77fbf62190970cdd4363aca72cf692bfad55895ba8758a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0af03afeaa2c9d90f1ab72fbf556b355b4fb802f3c847ff3009f8ca25fc19c674b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155ff8203e880a08873fe39538eeb066d3867b402c3d5dbc8bf65bc1884ac978ba73bc19e42266f88d2be8b8c27b65d9af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x4166ac1f85b016cceae952ae56a48f1164de49df7e0ba8600d41a62bffa8d2bb",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xd5555f63b1e84328b4c33bcf3684b9c00f89427419b291c48f154d08f977cbcf",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5555f63b1e84328b4c33bcf3684b9c00f89427419b291c48f154d08f977cbcfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x782c2dae2f83275939d262ff39cd0a8738f0299e004132f0bee12ebd82be7260",
-        "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_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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "1d02eaa67617cb04f477d5d642fe0a091887e5d95c7e5feee3d061047355d81d"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x029fe0",
-                    "hash" : "0x3d44660a91562f0c1108f1edb661ffbe3fa653282367e06aca6049c9f65ebf89",
-                    "mixHash" : "0x29fd1cdb88231ba75dbac7131648e5ca518e291ba4900099688106988ee89f61",
-                    "nonce" : "0x25a4fdbc793944e3",
-                    "number" : "0x01",
-                    "parentHash" : "0x4166ac1f85b016cceae952ae56a48f1164de49df7e0ba8600d41a62bffa8d2bb",
-                    "receiptTrie" : "0xdbcab094dcfdbed9ac81c2f9f65603858e995c1152dca8c3d66f8cd197d2ab26",
-                    "stateRoot" : "0x0d42005414f47787ed000e2a5d03e16f2b98b1aaa7464edada25424ca88c9f67",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a04166ac1f85b016cceae952ae56a48f1164de49df7e0ba8600d41a62bffa8d2bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00d42005414f47787ed000e2a5d03e16f2b98b1aaa7464edada25424ca88c9f67a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0dbcab094dcfdbed9ac81c2f9f65603858e995c1152dca8c3d66f8cd197d2ab26b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a029fd1cdb88231ba75dbac7131648e5ca518e291ba4900099688106988ee89f618825a4fdbc793944e3f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x4166ac1f85b016cceae952ae56a48f1164de49df7e0ba8600d41a62bffa8d2bb",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xd5555f63b1e84328b4c33bcf3684b9c00f89427419b291c48f154d08f977cbcf",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5555f63b1e84328b4c33bcf3684b9c00f89427419b291c48f154d08f977cbcfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3d44660a91562f0c1108f1edb661ffbe3fa653282367e06aca6049c9f65ebf89",
-        "network" : "Frontier",
-        "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" : "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" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcall_100_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "1d02eaa67617cb04f477d5d642fe0a091887e5d95c7e5feee3d061047355d81d"
+            "sourceHash" : "342205cff5fdc5eeb736cb0f9e3587a88c9b6ecf6e92674ff58c97be57840992"
         },
         "blocks" : [
             {
@@ -615,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150c9",
-                    "hash" : "0x0efc60f7029bc0bb60c6522f537a87231268ba864c45eec819cf0134693d9302",
-                    "mixHash" : "0xdc2c2634cf4cb57a6971d8cdfc686a1ff5d8b16457d9f3680f6ed5fbc3080ac7",
-                    "nonce" : "0x620087be4a9c9ae3",
+                    "hash" : "0xa0156d5e8453aaf0ce44c7189a5879efa99f828fba050510a6c8273ee28dad2c",
+                    "mixHash" : "0x2af04385449e66bea7f21e957a3c260a4f3a9ea11eab762d03f97da7433a3bab",
+                    "nonce" : "0x8579daed89647799",
                     "number" : "0x01",
                     "parentHash" : "0x4166ac1f85b016cceae952ae56a48f1164de49df7e0ba8600d41a62bffa8d2bb",
                     "receiptTrie" : "0x4727314bbdb90938e0f1d9dccd4016b988d4db06d4bc9404034c4451333c6dfb",
@@ -626,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a04166ac1f85b016cceae952ae56a48f1164de49df7e0ba8600d41a62bffa8d2bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f9083b6f959aa115b0ca25a51d1fa15a41d45a97a890a70f36e42bc736c984a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04727314bbdb90938e0f1d9dccd4016b988d4db06d4bc9404034c4451333c6dfbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150c98203e880a0dc2c2634cf4cb57a6971d8cdfc686a1ff5d8b16457d9f3680f6ed5fbc3080ac788620087be4a9c9ae3f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a04166ac1f85b016cceae952ae56a48f1164de49df7e0ba8600d41a62bffa8d2bba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa073f9083b6f959aa115b0ca25a51d1fa15a41d45a97a890a70f36e42bc736c984a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea04727314bbdb90938e0f1d9dccd4016b988d4db06d4bc9404034c4451333c6dfbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150c98203e880a02af04385449e66bea7f21e957a3c260a4f3a9ea11eab762d03f97da7433a3bab888579daed89647799f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -663,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d5555f63b1e84328b4c33bcf3684b9c00f89427419b291c48f154d08f977cbcfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0efc60f7029bc0bb60c6522f537a87231268ba864c45eec819cf0134693d9302",
+        "lastblockhash" : "0xa0156d5e8453aaf0ce44c7189a5879efa99f828fba050510a6c8273ee28dad2c",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBefore_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBefore_d0g0v0.json
index f621a6816..2c3cc5136 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBefore_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBefore_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_OOGMBefore_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "62080c0d10c15ce5f080d1a430b528fce3afe0a65e6c813d8484523ea4b9b3f2"
+            "sourceHash" : "98a9dbfae2055e093da524b74a2031eccd47b357c32415d9f6cc943d4cd755da"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f1",
-                    "hash" : "0xc66329caf6454b738d2b34685dd99829d86086f50540d1e140d11797773c94df",
-                    "mixHash" : "0x5efdea925c47febb8826ea9f13c8de1cd08886e8dee886d8d0a463e03990c5f4",
-                    "nonce" : "0x65a3a7ab849234f0",
+                    "hash" : "0x5f6851c4a2892acbc650c545370869aa6abe3a6dcb093616fddb8518c8176233",
+                    "mixHash" : "0x7e93c19bb62b14afec5877c02d59f04f1f6cd7d32929f12a9d490e004dbdbcb3",
+                    "nonce" : "0xf6d5d6a5cea01f5c",
                     "number" : "0x01",
                     "parentHash" : "0x75abbdfea21966a93f57cb7ebfee38e006fbf505ce7dedc5e493f03b1eae83b3",
                     "receiptTrie" : "0x577da455939dbfab0531e9b7f91c9084d2faeaf47e5372ecf6e9f1d584298fcf",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a075abbdfea21966a93f57cb7ebfee38e006fbf505ce7dedc5e493f03b1eae83b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04722960ef802335a494a975637001ef4506fb6e8f7cf67ed989f0945e870f343a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0577da455939dbfab0531e9b7f91c9084d2faeaf47e5372ecf6e9f1d584298fcfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f18203e880a05efdea925c47febb8826ea9f13c8de1cd08886e8dee886d8d0a463e03990c5f48865a3a7ab849234f0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a075abbdfea21966a93f57cb7ebfee38e006fbf505ce7dedc5e493f03b1eae83b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04722960ef802335a494a975637001ef4506fb6e8f7cf67ed989f0945e870f343a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0577da455939dbfab0531e9b7f91c9084d2faeaf47e5372ecf6e9f1d584298fcfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f18203e880a07e93c19bb62b14afec5877c02d59f04f1f6cd7d32929f12a9d490e004dbdbcb388f6d5d6a5cea01f5cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07550f8bd24e8666219491532169cd9f0ffc84903eac5341c95765a177baaf4bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc66329caf6454b738d2b34685dd99829d86086f50540d1e140d11797773c94df",
+        "lastblockhash" : "0x5f6851c4a2892acbc650c545370869aa6abe3a6dcb093616fddb8518c8176233",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -149,313 +149,13 @@
             }
         }
     },
-    "callcodecallcall_100_OOGMBefore_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "62080c0d10c15ce5f080d1a430b528fce3afe0a65e6c813d8484523ea4b9b3f2"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155f1",
-                    "hash" : "0xd99aa81f5a98ac72296c91dfe317825a6bc5bd295688fcc55c6c94ec76ff1e95",
-                    "mixHash" : "0x4e2672a2bd24415a8e4e2a23e2435e4701fbee207c18d65836b633179a8529ef",
-                    "nonce" : "0x14a5db03c2628b08",
-                    "number" : "0x01",
-                    "parentHash" : "0x75abbdfea21966a93f57cb7ebfee38e006fbf505ce7dedc5e493f03b1eae83b3",
-                    "receiptTrie" : "0x45fbf9e3564b4f55d36e4455d052e4f30a2962c8a01b95f1e919adb4acf93fd7",
-                    "stateRoot" : "0x5c11b427d3d69b2a979148786a0e82f8fab4ce6961813292aae2e02c31a4bbf7",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a075abbdfea21966a93f57cb7ebfee38e006fbf505ce7dedc5e493f03b1eae83b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05c11b427d3d69b2a979148786a0e82f8fab4ce6961813292aae2e02c31a4bbf7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea045fbf9e3564b4f55d36e4455d052e4f30a2962c8a01b95f1e919adb4acf93fd7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f18203e880a04e2672a2bd24415a8e4e2a23e2435e4701fbee207c18d65836b633179a8529ef8814a5db03c2628b08f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x75abbdfea21966a93f57cb7ebfee38e006fbf505ce7dedc5e493f03b1eae83b3",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x7550f8bd24e8666219491532169cd9f0ffc84903eac5341c95765a177baaf4bc",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07550f8bd24e8666219491532169cd9f0ffc84903eac5341c95765a177baaf4bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd99aa81f5a98ac72296c91dfe317825a6bc5bd295688fcc55c6c94ec76ff1e95",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555f1",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa0f",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcall_100_OOGMBefore_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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "62080c0d10c15ce5f080d1a430b528fce3afe0a65e6c813d8484523ea4b9b3f2"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155f1",
-                    "hash" : "0xaf04d16856e1c3fda02c8df8e39c677e1ef7e970fc2cdd89cb7439d1ff4d9277",
-                    "mixHash" : "0x7d1b7159407e898c0fb5665808918318778b0e8d8a408c391b103b250c98e08b",
-                    "nonce" : "0x41bfc59d2c205b14",
-                    "number" : "0x01",
-                    "parentHash" : "0x75abbdfea21966a93f57cb7ebfee38e006fbf505ce7dedc5e493f03b1eae83b3",
-                    "receiptTrie" : "0x45fbf9e3564b4f55d36e4455d052e4f30a2962c8a01b95f1e919adb4acf93fd7",
-                    "stateRoot" : "0x5c11b427d3d69b2a979148786a0e82f8fab4ce6961813292aae2e02c31a4bbf7",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a075abbdfea21966a93f57cb7ebfee38e006fbf505ce7dedc5e493f03b1eae83b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05c11b427d3d69b2a979148786a0e82f8fab4ce6961813292aae2e02c31a4bbf7a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea045fbf9e3564b4f55d36e4455d052e4f30a2962c8a01b95f1e919adb4acf93fd7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f18203e880a07d1b7159407e898c0fb5665808918318778b0e8d8a408c391b103b250c98e08b8841bfc59d2c205b14f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x75abbdfea21966a93f57cb7ebfee38e006fbf505ce7dedc5e493f03b1eae83b3",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x7550f8bd24e8666219491532169cd9f0ffc84903eac5341c95765a177baaf4bc",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07550f8bd24e8666219491532169cd9f0ffc84903eac5341c95765a177baaf4bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaf04d16856e1c3fda02c8df8e39c677e1ef7e970fc2cdd89cb7439d1ff4d9277",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555f1",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa0f",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcall_100_OOGMBefore_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "62080c0d10c15ce5f080d1a430b528fce3afe0a65e6c813d8484523ea4b9b3f2"
+            "sourceHash" : "98a9dbfae2055e093da524b74a2031eccd47b357c32415d9f6cc943d4cd755da"
         },
         "blocks" : [
             {
@@ -466,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "0xc1f36d6e424fca860cdf379e87fba35351f62863365e2720bbe018b7502b4413",
-                    "mixHash" : "0xfd085e046a6c1087a4b53e67ad4df163470abd17ccefd63113348ee43219fd1e",
-                    "nonce" : "0x8b56737eb8100011",
+                    "hash" : "0x185f1d185b69cd479ca026fffa3eab1df14a317df113dd0d287ac3646a16ce61",
+                    "mixHash" : "0xd8af0c4866ef9ef90129691477e1603d83de4b1d49d2b15db8eaa9251ae3e47d",
+                    "nonce" : "0x0c8caa83d759e90f",
                     "number" : "0x01",
                     "parentHash" : "0x75abbdfea21966a93f57cb7ebfee38e006fbf505ce7dedc5e493f03b1eae83b3",
                     "receiptTrie" : "0x881ec88ac014564218abda1f432fd136f34fbc2f6ab195cf43ccc286e460653f",
@@ -477,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a075abbdfea21966a93f57cb7ebfee38e006fbf505ce7dedc5e493f03b1eae83b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a1c28cd41df6c412a153914e5920b9d0a5a75fd48769af6d0cff2e4ec0cc0945a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0881ec88ac014564218abda1f432fd136f34fbc2f6ab195cf43ccc286e460653fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0fd085e046a6c1087a4b53e67ad4df163470abd17ccefd63113348ee43219fd1e888b56737eb8100011f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a075abbdfea21966a93f57cb7ebfee38e006fbf505ce7dedc5e493f03b1eae83b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a1c28cd41df6c412a153914e5920b9d0a5a75fd48769af6d0cff2e4ec0cc0945a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0881ec88ac014564218abda1f432fd136f34fbc2f6ab195cf43ccc286e460653fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0d8af0c4866ef9ef90129691477e1603d83de4b1d49d2b15db8eaa9251ae3e47d880c8caa83d759e90ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -514,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07550f8bd24e8666219491532169cd9f0ffc84903eac5341c95765a177baaf4bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc1f36d6e424fca860cdf379e87fba35351f62863365e2720bbe018b7502b4413",
+        "lastblockhash" : "0x185f1d185b69cd479ca026fffa3eab1df14a317df113dd0d287ac3646a16ce61",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -597,155 +297,5 @@
                 }
             }
         }
-    },
-    "callcodecallcall_100_OOGMBefore_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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "62080c0d10c15ce5f080d1a430b528fce3afe0a65e6c813d8484523ea4b9b3f2"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150c9",
-                    "hash" : "0x0d6b009fcac0959f6f490df03f6221b260485d61c8400f92555a7dd3c95381c9",
-                    "mixHash" : "0x2cebdca32a36df1379ba00b2b0a0a742de32532885be31a629aca8d5bd3fd15e",
-                    "nonce" : "0x43fb141b54d65a1e",
-                    "number" : "0x01",
-                    "parentHash" : "0x75abbdfea21966a93f57cb7ebfee38e006fbf505ce7dedc5e493f03b1eae83b3",
-                    "receiptTrie" : "0xeb7edd49a00b314ff3a073e14eceaa0b559f2612f6bed9c9c0ff6c97063282a5",
-                    "stateRoot" : "0xb8d2a5eb88169f6a37322ef300e7ec18bc4afadecd40aac4a976c7fceffb4719",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a075abbdfea21966a93f57cb7ebfee38e006fbf505ce7dedc5e493f03b1eae83b3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8d2a5eb88169f6a37322ef300e7ec18bc4afadecd40aac4a976c7fceffb4719a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0eb7edd49a00b314ff3a073e14eceaa0b559f2612f6bed9c9c0ff6c97063282a5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150c98203e880a02cebdca32a36df1379ba00b2b0a0a742de32532885be31a629aca8d5bd3fd15e8843fb141b54d65a1ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x75abbdfea21966a93f57cb7ebfee38e006fbf505ce7dedc5e493f03b1eae83b3",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x7550f8bd24e8666219491532169cd9f0ffc84903eac5341c95765a177baaf4bc",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07550f8bd24e8666219491532169cd9f0ffc84903eac5341c95765a177baaf4bca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0d6b009fcac0959f6f490df03f6221b260485d61c8400f92555a7dd3c95381c9",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "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" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEnd_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEnd_d0g0v0.json
index 5c051ae5f..bd65cdc17 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEnd_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEnd_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_SuicideEnd_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "6d185e0559857071c77c8eb478475f7295925de21aeffe0db00516c69cd63920"
+            "sourceHash" : "dde893f81a413f9e0d09ea97631c92cc65bfc638ed729cb94abfc9fb24a02872"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e4",
-                    "hash" : "0x0eb779daec53a1eedcb7fe40d17d10ef1c2320737d31fab2d76d5d488fd53129",
-                    "mixHash" : "0xc8c7d9632cdff7c2b89da129d8ca9bac3c658e35b5fa6b973ab25c5378b2fec1",
-                    "nonce" : "0xf3f010be4ecb6078",
+                    "hash" : "0x621bd05b755535e8dd72f664a46d25424f8011e6f03fbe1bc1b3c48061b2c65c",
+                    "mixHash" : "0x56035f144e6765470b9a668bcdcef63211fb21f3749a07c58cce489c50640228",
+                    "nonce" : "0xa651c8350e21d076",
                     "number" : "0x01",
                     "parentHash" : "0x8cc799f6c08365b6b073bede0f6047ce190d44cd46a1ff200c803c6bfa1528d5",
                     "receiptTrie" : "0xdfa6ff2e20e86a464bba21d71080772ef64ad6e872e20bbbc24c6bd5a5856dd0",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a08cc799f6c08365b6b073bede0f6047ce190d44cd46a1ff200c803c6bfa1528d5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d80b87a05fb2b7891e51253dcb6a802a5352c99ed916b25405ad850739063ac9a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0dfa6ff2e20e86a464bba21d71080772ef64ad6e872e20bbbc24c6bd5a5856dd0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e48203e880a0c8c7d9632cdff7c2b89da129d8ca9bac3c658e35b5fa6b973ab25c5378b2fec188f3f010be4ecb6078f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a08cc799f6c08365b6b073bede0f6047ce190d44cd46a1ff200c803c6bfa1528d5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d80b87a05fb2b7891e51253dcb6a802a5352c99ed916b25405ad850739063ac9a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0dfa6ff2e20e86a464bba21d71080772ef64ad6e872e20bbbc24c6bd5a5856dd0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e48203e880a056035f144e6765470b9a668bcdcef63211fb21f3749a07c58cce489c5064022888a651c8350e21d076f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb16b87b6ee68cd3ab6b17f8afb4b0cb67436db1504db38ff5d07c7a47faaea6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0eb779daec53a1eedcb7fe40d17d10ef1c2320737d31fab2d76d5d488fd53129",
+        "lastblockhash" : "0x621bd05b755535e8dd72f664a46d25424f8011e6f03fbe1bc1b3c48061b2c65c",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -141,297 +141,13 @@
             }
         }
     },
-    "callcodecallcall_100_SuicideEnd_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "6d185e0559857071c77c8eb478475f7295925de21aeffe0db00516c69cd63920"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0148e4",
-                    "hash" : "0x63ab0483f3544c5c50ee43e291f77927be3f7fd2e347c90e9ce407e3c1451e06",
-                    "mixHash" : "0x0d0bd041d562bd536f17b77c4ceaa6e9b713ddbfb48a3c3dbaf5c1dbe428591d",
-                    "nonce" : "0x44a4e0ac28263a2d",
-                    "number" : "0x01",
-                    "parentHash" : "0x8cc799f6c08365b6b073bede0f6047ce190d44cd46a1ff200c803c6bfa1528d5",
-                    "receiptTrie" : "0xc9099fcd4e84fcb2ebabfa66ffd690c9ad40729973f408976bebbdef932a0e2c",
-                    "stateRoot" : "0xcc325c08e880de960c3a72252514e230c6551fcefbe31b14961777d805dc91e8",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a08cc799f6c08365b6b073bede0f6047ce190d44cd46a1ff200c803c6bfa1528d5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc325c08e880de960c3a72252514e230c6551fcefbe31b14961777d805dc91e8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c9099fcd4e84fcb2ebabfa66ffd690c9ad40729973f408976bebbdef932a0e2cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e48203e880a00d0bd041d562bd536f17b77c4ceaa6e9b713ddbfb48a3c3dbaf5c1dbe428591d8844a4e0ac28263a2df862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x8cc799f6c08365b6b073bede0f6047ce190d44cd46a1ff200c803c6bfa1528d5",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xbb16b87b6ee68cd3ab6b17f8afb4b0cb67436db1504db38ff5d07c7a47faaea6",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb16b87b6ee68cd3ab6b17f8afb4b0cb67436db1504db38ff5d07c7a47faaea6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x63ab0483f3544c5c50ee43e291f77927be3f7fd2e347c90e9ce407e3c1451e06",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b5fb6fe400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548e4",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762b71c",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcall_100_SuicideEnd_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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "6d185e0559857071c77c8eb478475f7295925de21aeffe0db00516c69cd63920"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0148e4",
-                    "hash" : "0x04e57564036864d9d7f8743dadde3466b635c4974c50bed9b0283aedc69a64e5",
-                    "mixHash" : "0xba50625d4050a1d45362a9204f26af22dd4f02eb9523d009cb700795aff1548d",
-                    "nonce" : "0x4f2d7b60acc97ee7",
-                    "number" : "0x01",
-                    "parentHash" : "0x8cc799f6c08365b6b073bede0f6047ce190d44cd46a1ff200c803c6bfa1528d5",
-                    "receiptTrie" : "0xc9099fcd4e84fcb2ebabfa66ffd690c9ad40729973f408976bebbdef932a0e2c",
-                    "stateRoot" : "0xcc325c08e880de960c3a72252514e230c6551fcefbe31b14961777d805dc91e8",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a08cc799f6c08365b6b073bede0f6047ce190d44cd46a1ff200c803c6bfa1528d5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc325c08e880de960c3a72252514e230c6551fcefbe31b14961777d805dc91e8a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c9099fcd4e84fcb2ebabfa66ffd690c9ad40729973f408976bebbdef932a0e2cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e48203e880a0ba50625d4050a1d45362a9204f26af22dd4f02eb9523d009cb700795aff1548d884f2d7b60acc97ee7f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x8cc799f6c08365b6b073bede0f6047ce190d44cd46a1ff200c803c6bfa1528d5",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xbb16b87b6ee68cd3ab6b17f8afb4b0cb67436db1504db38ff5d07c7a47faaea6",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb16b87b6ee68cd3ab6b17f8afb4b0cb67436db1504db38ff5d07c7a47faaea6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x04e57564036864d9d7f8743dadde3466b635c4974c50bed9b0283aedc69a64e5",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b5fb6fe400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548e4",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762b71c",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcall_100_SuicideEnd_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "6d185e0559857071c77c8eb478475f7295925de21aeffe0db00516c69cd63920"
+            "sourceHash" : "dde893f81a413f9e0d09ea97631c92cc65bfc638ed729cb94abfc9fb24a02872"
         },
         "blocks" : [
             {
@@ -442,9 +158,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x38e353b50fbc5b0a932d97ebe72c07d964219595d18aa62c70bf48d7e8e5d4e2",
-                    "mixHash" : "0x6f5a0489c70a60bc249a7b41a39f74375cce012fda660ca1013c80edecb773f6",
-                    "nonce" : "0xc4c3b29e23659bad",
+                    "hash" : "0xdcd5030e73f12d0551dcf1857a0f0cfe8b9a92e3fe4df33cff2b06067d55aedb",
+                    "mixHash" : "0x28c84251053773f2137bba0544e33ee5dae009c8e5de53e2d107d67ef5a71743",
+                    "nonce" : "0x76dd6e973bef25c3",
                     "number" : "0x01",
                     "parentHash" : "0x8cc799f6c08365b6b073bede0f6047ce190d44cd46a1ff200c803c6bfa1528d5",
                     "receiptTrie" : "0x945b348e070c4e71a27c83bef83494e58b805d10f08d588ff48bbf298a6ad83c",
@@ -453,10 +169,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a08cc799f6c08365b6b073bede0f6047ce190d44cd46a1ff200c803c6bfa1528d5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbe598dc31ff6efa68e8ebb0dd9c8bd6503eb255f1c682c10290614ff2047298a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0945b348e070c4e71a27c83bef83494e58b805d10f08d588ff48bbf298a6ad83cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a06f5a0489c70a60bc249a7b41a39f74375cce012fda660ca1013c80edecb773f688c4c3b29e23659badf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a08cc799f6c08365b6b073bede0f6047ce190d44cd46a1ff200c803c6bfa1528d5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbe598dc31ff6efa68e8ebb0dd9c8bd6503eb255f1c682c10290614ff2047298a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0945b348e070c4e71a27c83bef83494e58b805d10f08d588ff48bbf298a6ad83cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a028c84251053773f2137bba0544e33ee5dae009c8e5de53e2d107d67ef5a717438876dd6e973bef25c3f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -490,7 +206,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb16b87b6ee68cd3ab6b17f8afb4b0cb67436db1504db38ff5d07c7a47faaea6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x38e353b50fbc5b0a932d97ebe72c07d964219595d18aa62c70bf48d7e8e5d4e2",
+        "lastblockhash" : "0xdcd5030e73f12d0551dcf1857a0f0cfe8b9a92e3fe4df33cff2b06067d55aedb",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -573,147 +289,5 @@
                 }
             }
         }
-    },
-    "callcodecallcall_100_SuicideEnd_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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "6d185e0559857071c77c8eb478475f7295925de21aeffe0db00516c69cd63920"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x012da0",
-                    "hash" : "0x2f3936defaabe16ad943b23d32e382e8deac40ce66bc6807feb650c8d69a9779",
-                    "mixHash" : "0x95b66983aa72496915a7c5be596d09b8d70fcac916c1c2e28a611980026390c5",
-                    "nonce" : "0xb582f9b32e541f6e",
-                    "number" : "0x01",
-                    "parentHash" : "0x8cc799f6c08365b6b073bede0f6047ce190d44cd46a1ff200c803c6bfa1528d5",
-                    "receiptTrie" : "0xfdd668fa7e65334a6b61063cf9066b47881d270f0d2f111055b6bb599423aefc",
-                    "stateRoot" : "0x9e3b32a6b53e420caab9dac3c1312c62172386951c13a0b17a1b7de23fe7f541",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a08cc799f6c08365b6b073bede0f6047ce190d44cd46a1ff200c803c6bfa1528d5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09e3b32a6b53e420caab9dac3c1312c62172386951c13a0b17a1b7de23fe7f541a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0fdd668fa7e65334a6b61063cf9066b47881d270f0d2f111055b6bb599423aefcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012da08203e880a095b66983aa72496915a7c5be596d09b8d70fcac916c1c2e28a611980026390c588b582f9b32e541f6ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x8cc799f6c08365b6b073bede0f6047ce190d44cd46a1ff200c803c6bfa1528d5",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xbb16b87b6ee68cd3ab6b17f8afb4b0cb67436db1504db38ff5d07c7a47faaea6",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bb16b87b6ee68cd3ab6b17f8afb4b0cb67436db1504db38ff5d07c7a47faaea6a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2f3936defaabe16ad943b23d32e382e8deac40ce66bc6807feb650c8d69a9779",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b5fb6fe400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f52da0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762d260",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddle_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddle_d0g0v0.json
index c1a217491..ae0eabc23 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddle_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddle_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_SuicideMiddle_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "06a6dc69ad5c8acf67b4f389dc449138ee672c2f630709dbfddf4415a8ff3112"
+            "sourceHash" : "42b1d06126482dc34078830610e06afaad5c787bb0fcc204834b6d15fcfff37d"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c4",
-                    "hash" : "0xae54180f8bf58eafcc833b350c9913046001bb4ab33e061bbebaf1bae503ad8b",
-                    "mixHash" : "0x7a5486186245dfab92d9e98f6f759f4d41c433b4e7c0d7cfa22980a60e1c6973",
-                    "nonce" : "0x37e1059178c1f792",
+                    "hash" : "0x83e22d62bdcf8bd1a73bfaacb26577b5d0eeeef342d74d2b3939eb42f08608bf",
+                    "mixHash" : "0xfcddbdd5791bb4a265df69a842167c932abc16e04e56de3900d095f73bae6ab9",
+                    "nonce" : "0x65527456c4d07cf9",
                     "number" : "0x01",
                     "parentHash" : "0x91eafc018fb9da9ae2ce5f50c53ae02972590a47aaff8ed1e95d39f5b859c7a7",
                     "receiptTrie" : "0x9cfe338f99c36eb562687de6302f5f1018f7c7847c8593f83122637b4e445fb2",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a091eafc018fb9da9ae2ce5f50c53ae02972590a47aaff8ed1e95d39f5b859c7a7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c5a3de22cd843181dd179b338891b676ead8894bf988c7aa78008735f520854da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09cfe338f99c36eb562687de6302f5f1018f7c7847c8593f83122637b4e445fb2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c48203e880a07a5486186245dfab92d9e98f6f759f4d41c433b4e7c0d7cfa22980a60e1c69738837e1059178c1f792f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a091eafc018fb9da9ae2ce5f50c53ae02972590a47aaff8ed1e95d39f5b859c7a7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c5a3de22cd843181dd179b338891b676ead8894bf988c7aa78008735f520854da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09cfe338f99c36eb562687de6302f5f1018f7c7847c8593f83122637b4e445fb2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c48203e880a0fcddbdd5791bb4a265df69a842167c932abc16e04e56de3900d095f73bae6ab98865527456c4d07cf9f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0843d8fc384d646fe0dcd6f5561c3eec4e238a29be8c0924c93807e59d695d63da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xae54180f8bf58eafcc833b350c9913046001bb4ab33e061bbebaf1bae503ad8b",
+        "lastblockhash" : "0x83e22d62bdcf8bd1a73bfaacb26577b5d0eeeef342d74d2b3939eb42f08608bf",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -141,297 +141,13 @@
             }
         }
     },
-    "callcodecallcall_100_SuicideMiddle_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "06a6dc69ad5c8acf67b4f389dc449138ee672c2f630709dbfddf4415a8ff3112"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c4",
-                    "hash" : "0xdaba4cd0c8240710da2c47259b2ffa68a08dd4e0e09ff8c708eeb523fdd014bb",
-                    "mixHash" : "0x91b8beea4a04cdab469e61a9c072867f0fcb9e0f5427cf9400e1f6874f31e0da",
-                    "nonce" : "0xd8c181f6502cb791",
-                    "number" : "0x01",
-                    "parentHash" : "0x91eafc018fb9da9ae2ce5f50c53ae02972590a47aaff8ed1e95d39f5b859c7a7",
-                    "receiptTrie" : "0xeaa282c0b09c80ba5c0b0a853e6532df656183fa9a1285c541a4d5057bc27df8",
-                    "stateRoot" : "0x5404c9f70dcf7695e25d9c7734284f95fb1f4cc9be0f241c580fb6a1f6712cbf",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a091eafc018fb9da9ae2ce5f50c53ae02972590a47aaff8ed1e95d39f5b859c7a7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05404c9f70dcf7695e25d9c7734284f95fb1f4cc9be0f241c580fb6a1f6712cbfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0eaa282c0b09c80ba5c0b0a853e6532df656183fa9a1285c541a4d5057bc27df8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c48203e880a091b8beea4a04cdab469e61a9c072867f0fcb9e0f5427cf9400e1f6874f31e0da88d8c181f6502cb791f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x91eafc018fb9da9ae2ce5f50c53ae02972590a47aaff8ed1e95d39f5b859c7a7",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x843d8fc384d646fe0dcd6f5561c3eec4e238a29be8c0924c93807e59d695d63d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0843d8fc384d646fe0dcd6f5561c3eec4e238a29be8c0924c93807e59d695d63da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdaba4cd0c8240710da2c47259b2ffa68a08dd4e0e09ff8c708eeb523fdd014bb",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c4",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a763563c",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcall_100_SuicideMiddle_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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "06a6dc69ad5c8acf67b4f389dc449138ee672c2f630709dbfddf4415a8ff3112"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c4",
-                    "hash" : "0xa7828ac2b88a990ec53fae91d1edc6775aa655e8e7fd35a2d8ac3d7c062d5909",
-                    "mixHash" : "0x3c10e9dcaf75371b6690efc5bb8eb74a2da0a8e14a8682a4ebe262619395f8fe",
-                    "nonce" : "0xc0e0e388ac2dc942",
-                    "number" : "0x01",
-                    "parentHash" : "0x91eafc018fb9da9ae2ce5f50c53ae02972590a47aaff8ed1e95d39f5b859c7a7",
-                    "receiptTrie" : "0xeaa282c0b09c80ba5c0b0a853e6532df656183fa9a1285c541a4d5057bc27df8",
-                    "stateRoot" : "0x5404c9f70dcf7695e25d9c7734284f95fb1f4cc9be0f241c580fb6a1f6712cbf",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a091eafc018fb9da9ae2ce5f50c53ae02972590a47aaff8ed1e95d39f5b859c7a7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05404c9f70dcf7695e25d9c7734284f95fb1f4cc9be0f241c580fb6a1f6712cbfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0eaa282c0b09c80ba5c0b0a853e6532df656183fa9a1285c541a4d5057bc27df8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c48203e880a03c10e9dcaf75371b6690efc5bb8eb74a2da0a8e14a8682a4ebe262619395f8fe88c0e0e388ac2dc942f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x91eafc018fb9da9ae2ce5f50c53ae02972590a47aaff8ed1e95d39f5b859c7a7",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x843d8fc384d646fe0dcd6f5561c3eec4e238a29be8c0924c93807e59d695d63d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0843d8fc384d646fe0dcd6f5561c3eec4e238a29be8c0924c93807e59d695d63da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa7828ac2b88a990ec53fae91d1edc6775aa655e8e7fd35a2d8ac3d7c062d5909",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c4",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a763563c",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcall_100_SuicideMiddle_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "06a6dc69ad5c8acf67b4f389dc449138ee672c2f630709dbfddf4415a8ff3112"
+            "sourceHash" : "42b1d06126482dc34078830610e06afaad5c787bb0fcc204834b6d15fcfff37d"
         },
         "blocks" : [
             {
@@ -442,9 +158,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x89f5a8c9e889931b9bb3afa3d4282b3377254fd04b2befb591ffd76857e77e15",
-                    "mixHash" : "0x57425ddf1c2e2096c2071547f198e1f8fd7e2c34780a340de7994a6325f58fa1",
-                    "nonce" : "0x986c5ca90e2b0424",
+                    "hash" : "0x5f56bbca3fc8a05d1a031bcc12b6097436bd22d1d5ef478bd536c78af75ac786",
+                    "mixHash" : "0x09544085b4fab086004a445d34d98b2f93efc658851457a7916846952906cdbc",
+                    "nonce" : "0x6a6ab82da27ccb4f",
                     "number" : "0x01",
                     "parentHash" : "0x91eafc018fb9da9ae2ce5f50c53ae02972590a47aaff8ed1e95d39f5b859c7a7",
                     "receiptTrie" : "0x862b053038624d060b317b2be3a0c99dd6435ba3f42e8e44f1ce944f4c662275",
@@ -453,10 +169,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a091eafc018fb9da9ae2ce5f50c53ae02972590a47aaff8ed1e95d39f5b859c7a7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f455f312f0b515d4709f93624a6dd8fb8e15ff388cbc5877c99e5e13b8b32aaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0862b053038624d060b317b2be3a0c99dd6435ba3f42e8e44f1ce944f4c662275b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a057425ddf1c2e2096c2071547f198e1f8fd7e2c34780a340de7994a6325f58fa188986c5ca90e2b0424f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a091eafc018fb9da9ae2ce5f50c53ae02972590a47aaff8ed1e95d39f5b859c7a7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f455f312f0b515d4709f93624a6dd8fb8e15ff388cbc5877c99e5e13b8b32aaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0862b053038624d060b317b2be3a0c99dd6435ba3f42e8e44f1ce944f4c662275b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a009544085b4fab086004a445d34d98b2f93efc658851457a7916846952906cdbc886a6ab82da27ccb4ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -490,7 +206,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0843d8fc384d646fe0dcd6f5561c3eec4e238a29be8c0924c93807e59d695d63da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x89f5a8c9e889931b9bb3afa3d4282b3377254fd04b2befb591ffd76857e77e15",
+        "lastblockhash" : "0x5f56bbca3fc8a05d1a031bcc12b6097436bd22d1d5ef478bd536c78af75ac786",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -573,147 +289,5 @@
                 }
             }
         }
-    },
-    "callcodecallcall_100_SuicideMiddle_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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "06a6dc69ad5c8acf67b4f389dc449138ee672c2f630709dbfddf4415a8ff3112"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x9114",
-                    "hash" : "0x870539c946c36e4f83e12c638df9030555605e468e45e612b6d0e0f8d364f976",
-                    "mixHash" : "0xc72ca18424334d0ad7843f0ad5347aaf38d85c0f5d04754f3527719c236eccdc",
-                    "nonce" : "0x1081375c557ba9af",
-                    "number" : "0x01",
-                    "parentHash" : "0x91eafc018fb9da9ae2ce5f50c53ae02972590a47aaff8ed1e95d39f5b859c7a7",
-                    "receiptTrie" : "0xa752259e2e266edf16a7b73ccf49f98b8e1e362db3e46b19b53c86ac05e69908",
-                    "stateRoot" : "0x5adfa53b9386d53f5fa1da0d7f48c3e92c80f4dc6c9807ce1fcc457ad27bda07",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a091eafc018fb9da9ae2ce5f50c53ae02972590a47aaff8ed1e95d39f5b859c7a7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05adfa53b9386d53f5fa1da0d7f48c3e92c80f4dc6c9807ce1fcc457ad27bda07a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0a752259e2e266edf16a7b73ccf49f98b8e1e362db3e46b19b53c86ac05e69908b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291148203e880a0c72ca18424334d0ad7843f0ad5347aaf38d85c0f5d04754f3527719c236eccdc881081375c557ba9aff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x91eafc018fb9da9ae2ce5f50c53ae02972590a47aaff8ed1e95d39f5b859c7a7",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x843d8fc384d646fe0dcd6f5561c3eec4e238a29be8c0924c93807e59d695d63d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0843d8fc384d646fe0dcd6f5561c3eec4e238a29be8c0924c93807e59d695d63da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x870539c946c36e4f83e12c638df9030555605e468e45e612b6d0e0f8d364f976",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49114",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7636eec",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_d0g0v0.json
index bf3ddbf53..65b92c5a4 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcall_100_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_d0g0v0Filler.json",
-            "sourceHash" : "8a5474caef40050c726b16695ac224fa89e0f33a4b912cd197625220e22fb81b"
+            "sourceHash" : "4823619c3b5183d4aacd91fd0578b4fc42d4fb277fea84542175929b1a712967"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x043899",
-                    "hash" : "0x841b57f13784fe70338cdaa166291a6902c81ed3081f22b9a59610d344112cdf",
-                    "mixHash" : "0x574fd37a380298afdf79d4b697b0d6effc01bb57f6162151854c2c24a94db876",
-                    "nonce" : "0x59a6fde688130466",
+                    "hash" : "0xe161756b5aea1d486c6c69a43e34770c8b100f2bd9deeb8352e0148191a5503c",
+                    "mixHash" : "0xa90f75dac67c14590cc8f866ba06cd672d1e2d79cb5daefb03dc0c7663325600",
+                    "nonce" : "0xc94a55ec4c3d8945",
                     "number" : "0x01",
                     "parentHash" : "0xe9d87776dbd3ee40936d69ae59ccb15f2024a388a778ca3cca83a4f93db82a0a",
                     "receiptTrie" : "0x788046ab48f832ce7c28bcf83134cae2f19a8f70ccb47def42b687bfc50ccdbc",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0e9d87776dbd3ee40936d69ae59ccb15f2024a388a778ca3cca83a4f93db82a0aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ed607e8e69ca70e3f292b23ce943cc1e4d4559cc09a8e82528bd0edeb65bc91a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0788046ab48f832ce7c28bcf83134cae2f19a8f70ccb47def42b687bfc50ccdbcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830438998203e880a0574fd37a380298afdf79d4b697b0d6effc01bb57f6162151854c2c24a94db8768859a6fde688130466f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0e9d87776dbd3ee40936d69ae59ccb15f2024a388a778ca3cca83a4f93db82a0aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ed607e8e69ca70e3f292b23ce943cc1e4d4559cc09a8e82528bd0edeb65bc91a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0788046ab48f832ce7c28bcf83134cae2f19a8f70ccb47def42b687bfc50ccdbcb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830438998203e880a0a90f75dac67c14590cc8f866ba06cd672d1e2d79cb5daefb03dc0c766332560088c94a55ec4c3d8945f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04525090c5ecc440de54f7d2d30e708232e0b8eeb74e7e4ea45b300d145fed9b5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x841b57f13784fe70338cdaa166291a6902c81ed3081f22b9a59610d344112cdf",
+        "lastblockhash" : "0xe161756b5aea1d486c6c69a43e34770c8b100f2bd9deeb8352e0148191a5503c",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -160,335 +160,13 @@
             }
         }
     },
-    "callcodecallcall_100_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_d0g0v0Filler.json",
-            "sourceHash" : "8a5474caef40050c726b16695ac224fa89e0f33a4b912cd197625220e22fb81b"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x043899",
-                    "hash" : "0x7cb5c889f4c2ac92c3f7c02bfab605418aa73b71fb1073864e969436c2474b31",
-                    "mixHash" : "0x4c046828c2059f1e060f06b96eed0feb667a5b7aa23888af18b09e66584ff3a4",
-                    "nonce" : "0x704496988eee9f18",
-                    "number" : "0x01",
-                    "parentHash" : "0xe9d87776dbd3ee40936d69ae59ccb15f2024a388a778ca3cca83a4f93db82a0a",
-                    "receiptTrie" : "0x6bf1bb05cc3f0a2f374e65088d181496a80e882c1350cffb26dc604412a72b42",
-                    "stateRoot" : "0x9e82a4b219c01d22e43d27ab0f3a2f05343b6eef31ffc78fe428a68a41279d29",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0e9d87776dbd3ee40936d69ae59ccb15f2024a388a778ca3cca83a4f93db82a0aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09e82a4b219c01d22e43d27ab0f3a2f05343b6eef31ffc78fe428a68a41279d29a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a06bf1bb05cc3f0a2f374e65088d181496a80e882c1350cffb26dc604412a72b42b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830438998203e880a04c046828c2059f1e060f06b96eed0feb667a5b7aa23888af18b09e66584ff3a488704496988eee9f18f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xe9d87776dbd3ee40936d69ae59ccb15f2024a388a778ca3cca83a4f93db82a0a",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x4525090c5ecc440de54f7d2d30e708232e0b8eeb74e7e4ea45b300d145fed9b5",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04525090c5ecc440de54f7d2d30e708232e0b8eeb74e7e4ea45b300d145fed9b5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7cb5c889f4c2ac92c3f7c02bfab605418aa73b71fb1073864e969436c2474b31",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x014a" : "0x1000000000000000000000000000000000000000",
-                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x0150" : "0x40",
-                    "0x0152" : "0x26",
-                    "0x0154" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01",
-                    "0x04" : "0x1000000000000000000000000000000000000000",
-                    "0x05" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x06" : "0x02"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006001731000000000000000000000000000000000000002620493e0f260015533600555",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060027310000000000000000000000000000000000000036203d090f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346006553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f83899",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75fc767",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006001731000000000000000000000000000000000000002620493e0f260015533600555",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060027310000000000000000000000000000000000000036203d090f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346006553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcall_100_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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_d0g0v0Filler.json",
-            "sourceHash" : "8a5474caef40050c726b16695ac224fa89e0f33a4b912cd197625220e22fb81b"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x043899",
-                    "hash" : "0x9cfb591a8bbc04c075407716244cca22c1435072fd35c21dc51abe32cdc1ed01",
-                    "mixHash" : "0x32718329f1ee9618f87de2ba46502ba588210cb6e76dd49b15fa47a3dda644a4",
-                    "nonce" : "0x0273d0ddc8596bc1",
-                    "number" : "0x01",
-                    "parentHash" : "0xe9d87776dbd3ee40936d69ae59ccb15f2024a388a778ca3cca83a4f93db82a0a",
-                    "receiptTrie" : "0x6bf1bb05cc3f0a2f374e65088d181496a80e882c1350cffb26dc604412a72b42",
-                    "stateRoot" : "0x9e82a4b219c01d22e43d27ab0f3a2f05343b6eef31ffc78fe428a68a41279d29",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0e9d87776dbd3ee40936d69ae59ccb15f2024a388a778ca3cca83a4f93db82a0aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09e82a4b219c01d22e43d27ab0f3a2f05343b6eef31ffc78fe428a68a41279d29a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a06bf1bb05cc3f0a2f374e65088d181496a80e882c1350cffb26dc604412a72b42b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830438998203e880a032718329f1ee9618f87de2ba46502ba588210cb6e76dd49b15fa47a3dda644a4880273d0ddc8596bc1f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xe9d87776dbd3ee40936d69ae59ccb15f2024a388a778ca3cca83a4f93db82a0a",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x4525090c5ecc440de54f7d2d30e708232e0b8eeb74e7e4ea45b300d145fed9b5",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04525090c5ecc440de54f7d2d30e708232e0b8eeb74e7e4ea45b300d145fed9b5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9cfb591a8bbc04c075407716244cca22c1435072fd35c21dc51abe32cdc1ed01",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x014a" : "0x1000000000000000000000000000000000000000",
-                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x0150" : "0x40",
-                    "0x0152" : "0x26",
-                    "0x0154" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01",
-                    "0x04" : "0x1000000000000000000000000000000000000000",
-                    "0x05" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x06" : "0x02"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006001731000000000000000000000000000000000000002620493e0f260015533600555",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060027310000000000000000000000000000000000000036203d090f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346006553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f83899",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75fc767",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006001731000000000000000000000000000000000000002620493e0f260015533600555",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060027310000000000000000000000000000000000000036203d090f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346006553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcall_100_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_d0g0v0Filler.json",
-            "sourceHash" : "8a5474caef40050c726b16695ac224fa89e0f33a4b912cd197625220e22fb81b"
+            "sourceHash" : "4823619c3b5183d4aacd91fd0578b4fc42d4fb277fea84542175929b1a712967"
         },
         "blocks" : [
             {
@@ -499,9 +177,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0xcb40ffe8a23d9d404b1e753bea25b86cfbbc484f1b8117516acb663d4d1e05c4",
-                    "mixHash" : "0xd4e715f04dbc3df2ed9c43b4dc53aed9765b516b95c251570a0ed6c017a2758e",
-                    "nonce" : "0x08ea0651b2383c49",
+                    "hash" : "0x804c415c36ada2c4424177eb789283f55562ce7f8b9b8071bc75d6d5ab9f95cd",
+                    "mixHash" : "0x8265b985c59d16490b71730998756a122c4a05cee8e3e788d5d6459ce0d8a920",
+                    "nonce" : "0x7be7fc35f99af48b",
                     "number" : "0x01",
                     "parentHash" : "0xe9d87776dbd3ee40936d69ae59ccb15f2024a388a778ca3cca83a4f93db82a0a",
                     "receiptTrie" : "0x99647971dc2306d15018020b3ab3a5e1aa3861235698ff08b3d7a29c2e4b12e0",
@@ -510,10 +188,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0e9d87776dbd3ee40936d69ae59ccb15f2024a388a778ca3cca83a4f93db82a0aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0992a53ccb37496ccde7ffa056a3c4e97571653266aac0ba1c8ae4510d520f042a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a099647971dc2306d15018020b3ab3a5e1aa3861235698ff08b3d7a29c2e4b12e0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0d4e715f04dbc3df2ed9c43b4dc53aed9765b516b95c251570a0ed6c017a2758e8808ea0651b2383c49f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0e9d87776dbd3ee40936d69ae59ccb15f2024a388a778ca3cca83a4f93db82a0aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0992a53ccb37496ccde7ffa056a3c4e97571653266aac0ba1c8ae4510d520f042a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a099647971dc2306d15018020b3ab3a5e1aa3861235698ff08b3d7a29c2e4b12e0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a08265b985c59d16490b71730998756a122c4a05cee8e3e788d5d6459ce0d8a920887be7fc35f99af48bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -547,7 +225,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04525090c5ecc440de54f7d2d30e708232e0b8eeb74e7e4ea45b300d145fed9b5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcb40ffe8a23d9d404b1e753bea25b86cfbbc484f1b8117516acb663d4d1e05c4",
+        "lastblockhash" : "0x804c415c36ada2c4424177eb789283f55562ce7f8b9b8071bc75d6d5ab9f95cd",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -630,166 +308,5 @@
                 }
             }
         }
-    },
-    "callcodecallcall_100_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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_100_d0g0v0Filler.json",
-            "sourceHash" : "8a5474caef40050c726b16695ac224fa89e0f33a4b912cd197625220e22fb81b"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0430dd",
-                    "hash" : "0x324f9f0db8b78d89a5399829fa589980a987ee105eb0c32075afe71cdafe8373",
-                    "mixHash" : "0x4b11cc81822884d4edb391d8de64e740afc53651db29944fb3e85bc2f9f616bb",
-                    "nonce" : "0x1c86c5163a1d4d80",
-                    "number" : "0x01",
-                    "parentHash" : "0xe9d87776dbd3ee40936d69ae59ccb15f2024a388a778ca3cca83a4f93db82a0a",
-                    "receiptTrie" : "0xbd469b718a22448fec99a45c98c63d7577d566a4660af8b12c2b69c52310a38d",
-                    "stateRoot" : "0x2b30c1cb6843ef2800cdbb1a590272165948e5d4238a324707a7e9f447330592",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0e9d87776dbd3ee40936d69ae59ccb15f2024a388a778ca3cca83a4f93db82a0aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b30c1cb6843ef2800cdbb1a590272165948e5d4238a324707a7e9f447330592a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0bd469b718a22448fec99a45c98c63d7577d566a4660af8b12c2b69c52310a38db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830430dd8203e880a04b11cc81822884d4edb391d8de64e740afc53651db29944fb3e85bc2f9f616bb881c86c5163a1d4d80f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xe9d87776dbd3ee40936d69ae59ccb15f2024a388a778ca3cca83a4f93db82a0a",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x4525090c5ecc440de54f7d2d30e708232e0b8eeb74e7e4ea45b300d145fed9b5",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04525090c5ecc440de54f7d2d30e708232e0b8eeb74e7e4ea45b300d145fed9b5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x324f9f0db8b78d89a5399829fa589980a987ee105eb0c32075afe71cdafe8373",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x014a" : "0x1000000000000000000000000000000000000000",
-                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x0150" : "0x40",
-                    "0x0152" : "0x26",
-                    "0x0154" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01",
-                    "0x04" : "0x1000000000000000000000000000000000000000",
-                    "0x05" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x06" : "0x02"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006001731000000000000000000000000000000000000002620493e0f260015533600555",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060027310000000000000000000000000000000000000036203d090f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346006553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f830dd",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75fcf23",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006001731000000000000000000000000000000000000002620493e0f260015533600555",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060027310000000000000000000000000000000000000036203d090f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346006553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVE_d0g0v0.json
index d8095ee6f..360d199be 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVE_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcall_ABCB_RECURSIVE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "5a4ade662d11b7542c4581d8549adebb34c388ce323372c03977149472938975"
+            "sourceHash" : "dbd060fd51021ba91eb43557af5e665a80a2877aebc6de5272e0c912a3e46401"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab7b",
-                    "hash" : "0xae61b70e17be9c11a3030a34e27c16dcc7fe588154a15b2191b36da1390d3303",
-                    "mixHash" : "0x53b982a68e87a583cbd95a04aae27931808bf1d0eaae52bdb3278393b1d2fce6",
-                    "nonce" : "0x2029f616901606f0",
+                    "hash" : "0x7e80f24fb85f81afdfe5b90b1566cbfd451926176e41a85eab93c4acead45404",
+                    "mixHash" : "0x521c5d98213945cee63c1f408ed47602b6d581adf6dcc324fadd368d9f1e8141",
+                    "nonce" : "0xbe9f3ba3ad849c71",
                     "number" : "0x01",
                     "parentHash" : "0xbefca40263783b714d289340524da3733981a3f431cab09f6611bc58d9a70e95",
                     "receiptTrie" : "0x63a01b86e4342726a564a98d55dac51745ef3a32d1a9d5515f4a6e0762a84fa3",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0befca40263783b714d289340524da3733981a3f431cab09f6611bc58d9a70e95a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040c8992408f5b5aa9b049ffc52152445855aae57e05805d9d83912ddcfb7326ba06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a063a01b86e4342726a564a98d55dac51745ef3a32d1a9d5515f4a6e0762a84fa3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7b8203e880a053b982a68e87a583cbd95a04aae27931808bf1d0eaae52bdb3278393b1d2fce6882029f616901606f0f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0befca40263783b714d289340524da3733981a3f431cab09f6611bc58d9a70e95a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040c8992408f5b5aa9b049ffc52152445855aae57e05805d9d83912ddcfb7326ba06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a063a01b86e4342726a564a98d55dac51745ef3a32d1a9d5515f4a6e0762a84fa3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7b8203e880a0521c5d98213945cee63c1f408ed47602b6d581adf6dcc324fadd368d9f1e814188be9f3ba3ad849c71f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f8bfb7290e171f30e60dd8155e6be1a0abcf9596b0ba11481f1e8b95935eddba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xae61b70e17be9c11a3030a34e27c16dcc7fe588154a15b2191b36da1390d3303",
+        "lastblockhash" : "0x7e80f24fb85f81afdfe5b90b1566cbfd451926176e41a85eab93c4acead45404",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -136,287 +136,13 @@
             }
         }
     },
-    "callcodecallcall_ABCB_RECURSIVE_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "5a4ade662d11b7542c4581d8549adebb34c388ce323372c03977149472938975"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08ab7b",
-                    "hash" : "0x224e94d14160f5ea5de6e6f7ca91b128df121207ed7fa14188442e9f5010ae85",
-                    "mixHash" : "0x9ae80d0d473be73317a0ddc70530fea64fdbba4a7c9a97234cdf46aa01cce1aa",
-                    "nonce" : "0xef5c08518d035528",
-                    "number" : "0x01",
-                    "parentHash" : "0xbefca40263783b714d289340524da3733981a3f431cab09f6611bc58d9a70e95",
-                    "receiptTrie" : "0x77c59f5e896527a0f71c250d8108b4b9ce50eb240b3e54ec824936248ce1b14b",
-                    "stateRoot" : "0x4a0b287ee634653c904921b10e8970c1e104e13727ca6570c4f1ca623c387cc0",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f9a0befca40263783b714d289340524da3733981a3f431cab09f6611bc58d9a70e95a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a0b287ee634653c904921b10e8970c1e104e13727ca6570c4f1ca623c387cc0a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a077c59f5e896527a0f71c250d8108b4b9ce50eb240b3e54ec824936248ce1b14bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7b8203e880a09ae80d0d473be73317a0ddc70530fea64fdbba4a7c9a97234cdf46aa01cce1aa88ef5c08518d035528f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x01c9c380",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
-                        "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0xb2d05e00",
-            "gasUsed" : "0x00",
-            "hash" : "0xbefca40263783b714d289340524da3733981a3f431cab09f6611bc58d9a70e95",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x1f8bfb7290e171f30e60dd8155e6be1a0abcf9596b0ba11481f1e8b95935eddb",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f8bfb7290e171f30e60dd8155e6be1a0abcf9596b0ba11481f1e8b95935eddba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x224e94d14160f5ea5de6e6f7ca91b128df121207ed7fa14188442e9f5010ae85",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000163017d7840f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fcab7b",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5485",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000163017d7840f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcall_ABCB_RECURSIVE_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/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "5a4ade662d11b7542c4581d8549adebb34c388ce323372c03977149472938975"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08ab7b",
-                    "hash" : "0x355a7c7a7c9be60e390a0731abfc8f28be4de0c2b8f33432836567fc771283b5",
-                    "mixHash" : "0xec60e10af1720824a922b8c1c21e0135d7f53265f9af35495c395f31e094e8a6",
-                    "nonce" : "0x97dab064d02d165b",
-                    "number" : "0x01",
-                    "parentHash" : "0xbefca40263783b714d289340524da3733981a3f431cab09f6611bc58d9a70e95",
-                    "receiptTrie" : "0x77c59f5e896527a0f71c250d8108b4b9ce50eb240b3e54ec824936248ce1b14b",
-                    "stateRoot" : "0x4a0b287ee634653c904921b10e8970c1e104e13727ca6570c4f1ca623c387cc0",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f9a0befca40263783b714d289340524da3733981a3f431cab09f6611bc58d9a70e95a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04a0b287ee634653c904921b10e8970c1e104e13727ca6570c4f1ca623c387cc0a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a077c59f5e896527a0f71c250d8108b4b9ce50eb240b3e54ec824936248ce1b14bb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab7b8203e880a0ec60e10af1720824a922b8c1c21e0135d7f53265f9af35495c395f31e094e8a68897dab064d02d165bf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x01c9c380",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
-                        "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0xb2d05e00",
-            "gasUsed" : "0x00",
-            "hash" : "0xbefca40263783b714d289340524da3733981a3f431cab09f6611bc58d9a70e95",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x1f8bfb7290e171f30e60dd8155e6be1a0abcf9596b0ba11481f1e8b95935eddb",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f8bfb7290e171f30e60dd8155e6be1a0abcf9596b0ba11481f1e8b95935eddba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x355a7c7a7c9be60e390a0731abfc8f28be4de0c2b8f33432836567fc771283b5",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000163017d7840f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fcab7b",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5485",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000163017d7840f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcall_ABCB_RECURSIVE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "5a4ade662d11b7542c4581d8549adebb34c388ce323372c03977149472938975"
+            "sourceHash" : "dbd060fd51021ba91eb43557af5e665a80a2877aebc6de5272e0c912a3e46401"
         },
         "blocks" : [
             {
@@ -427,9 +153,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x01c9c380",
-                    "hash" : "0x8778f7303b896a6c677efd0c84e6f3d2c3fe130d3c5675285fdb82737d1027a7",
-                    "mixHash" : "0x9cf5b6700645f2f1cc7510f4580d873452adca417340095951ce1bd891d5780c",
-                    "nonce" : "0x1b3991304b600fa0",
+                    "hash" : "0xa84360a19c074e87dfb944a86ece975a1f4d4e8ca330f69f496bb558d98d7c48",
+                    "mixHash" : "0xebfec0bbf36fb3fd7e2b8c205100e993c7e22acb9fc60561aa25766bc12aae7c",
+                    "nonce" : "0xb21fd4784775f665",
                     "number" : "0x01",
                     "parentHash" : "0xbefca40263783b714d289340524da3733981a3f431cab09f6611bc58d9a70e95",
                     "receiptTrie" : "0x687a4d974533ed1d691af5b6065ed5cf95e1232931a83d28020fe30bb8c37464",
@@ -438,10 +164,10 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa0befca40263783b714d289340524da3733981a3f431cab09f6611bc58d9a70e95a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed78a65c686c05c24856eaca456703371ac23437b145b04228dd64819521ebf1a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0687a4d974533ed1d691af5b6065ed5cf95e1232931a83d28020fe30bb8c37464b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008401c9c3808203e880a09cf5b6700645f2f1cc7510f4580d873452adca417340095951ce1bd891d5780c881b3991304b600fa0f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90263f901faa0befca40263783b714d289340524da3733981a3f431cab09f6611bc58d9a70e95a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed78a65c686c05c24856eaca456703371ac23437b145b04228dd64819521ebf1a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0687a4d974533ed1d691af5b6065ed5cf95e1232931a83d28020fe30bb8c37464b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008401c9c3808203e880a0ebfec0bbf36fb3fd7e2b8c205100e993c7e22acb9fc60561aa25766bc12aae7c88b21fd4784775f665f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -475,7 +201,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f8bfb7290e171f30e60dd8155e6be1a0abcf9596b0ba11481f1e8b95935eddba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8778f7303b896a6c677efd0c84e6f3d2c3fe130d3c5675285fdb82737d1027a7",
+        "lastblockhash" : "0xa84360a19c074e87dfb944a86ece975a1f4d4e8ca330f69f496bb558d98d7c48",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -548,10 +274,10 @@
     "callcodecallcall_ABCB_RECURSIVE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcall_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "5a4ade662d11b7542c4581d8549adebb34c388ce323372c03977149472938975"
+            "sourceHash" : "dbd060fd51021ba91eb43557af5e665a80a2877aebc6de5272e0c912a3e46401"
         },
         "blocks" : [
             {
@@ -562,9 +288,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3bf",
-                    "hash" : "0xc99e82e251b0cc991564acf82f5be3b925ce57ff1d5a86222de21b8653a8c106",
-                    "mixHash" : "0x9137b5f63a9745a2b70158bfe6b3df6622871a198600cc8b15f5182c149d11a0",
-                    "nonce" : "0xdbec8957f6e756a9",
+                    "hash" : "0x0603cc1dc3fcddaa6f928e0aab0c5639880c7e1bf27e7e4291fb1bf738b6e459",
+                    "mixHash" : "0x93025b690d1d6cfbf56ef6b2cb2813cf53f0e4cbc39385c5230fb34bc3954fd1",
+                    "nonce" : "0x3ea13ed934a39451",
                     "number" : "0x01",
                     "parentHash" : "0xbefca40263783b714d289340524da3733981a3f431cab09f6611bc58d9a70e95",
                     "receiptTrie" : "0x87e8628967fdb87c58665a9d5c913d1f8c6bcd34ee822ba6e4065e2e8edd0b74",
@@ -573,10 +299,10 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a0befca40263783b714d289340524da3733981a3f431cab09f6611bc58d9a70e95a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0354eaf8ff81feaa38a24e47624353654a94ec030168813d3cd84ce4f9f2cb90fa06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a087e8628967fdb87c58665a9d5c913d1f8c6bcd34ee822ba6e4065e2e8edd0b74b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3bf8203e880a09137b5f63a9745a2b70158bfe6b3df6622871a198600cc8b15f5182c149d11a088dbec8957f6e756a9f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a0befca40263783b714d289340524da3733981a3f431cab09f6611bc58d9a70e95a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0354eaf8ff81feaa38a24e47624353654a94ec030168813d3cd84ce4f9f2cb90fa06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a087e8628967fdb87c58665a9d5c913d1f8c6bcd34ee822ba6e4065e2e8edd0b74b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3bf8203e880a093025b690d1d6cfbf56ef6b2cb2813cf53f0e4cbc39385c5230fb34bc3954fd1883ea13ed934a39451f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -610,7 +336,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01f8bfb7290e171f30e60dd8155e6be1a0abcf9596b0ba11481f1e8b95935eddba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc99e82e251b0cc991564acf82f5be3b925ce57ff1d5a86222de21b8653a8c106",
+        "lastblockhash" : "0x0603cc1dc3fcddaa6f928e0aab0c5639880c7e1bf27e7e4291fb1bf738b6e459",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGE_d0g0v0.json
index 1fb1c3a4d..5c71b01e1 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGE_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_OOGE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "141b8653540e4595014ecd2412e1286f380cf9ee038d1622391425dab0674810"
+            "sourceHash" : "67205bf65a4638c880f83a277c21ca55f9660a403fd4776ba33d5849c4705c64"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x01588c",
-                    "hash" : "0xc1df6b37bb4d7208c993bd96a2272af08083d5e451ba8b6ac61fc10c1660f4d8",
-                    "mixHash" : "0xc9f550e069a7770add036338425b3a06e8bf0f16de9d71addee8b64512676fee",
-                    "nonce" : "0xf9db4118f1e6e5b3",
+                    "hash" : "0xbde80a657f0cc4e31814efc0b1c986426fd46e000b6ec260a7afe23ba02f4a20",
+                    "mixHash" : "0xfe07954a4869a96514853cba33ffa2c94f29c9c235ace9f4c4d2fb97f267c420",
+                    "nonce" : "0xd218616dd36a9943",
                     "number" : "0x01",
                     "parentHash" : "0xbdedd777fb740dd7ab7ec6ee4dc3316fba8f1e9e3e35d771f3f4ebe5bfd3502d",
                     "receiptTrie" : "0xfb18c88fc1db8de08a7648b8ab27197ee3d05ab23924bce4196dc532701fa2cb",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0bdedd777fb740dd7ab7ec6ee4dc3316fba8f1e9e3e35d771f3f4ebe5bfd3502da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d0c1dec3a30ac918942b44b92c91ec460e0df19280542152a562d70f31867a2a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fb18c88fc1db8de08a7648b8ab27197ee3d05ab23924bce4196dc532701fa2cbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301588c8203e880a0c9f550e069a7770add036338425b3a06e8bf0f16de9d71addee8b64512676fee88f9db4118f1e6e5b3f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0bdedd777fb740dd7ab7ec6ee4dc3316fba8f1e9e3e35d771f3f4ebe5bfd3502da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07d0c1dec3a30ac918942b44b92c91ec460e0df19280542152a562d70f31867a2a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fb18c88fc1db8de08a7648b8ab27197ee3d05ab23924bce4196dc532701fa2cbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301588c8203e880a0fe07954a4869a96514853cba33ffa2c94f29c9c235ace9f4c4d2fb97f267c42088d218616dd36a9943f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c693f3c846825385726e18830f89d87298bb2fd235d44b0452d00af43d06193a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc1df6b37bb4d7208c993bd96a2272af08083d5e451ba8b6ac61fc10c1660f4d8",
+        "lastblockhash" : "0xbde80a657f0cc4e31814efc0b1c986426fd46e000b6ec260a7afe23ba02f4a20",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -150,315 +150,13 @@
             }
         }
     },
-    "callcodecallcallcode_101_OOGE_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "141b8653540e4595014ecd2412e1286f380cf9ee038d1622391425dab0674810"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x01588c",
-                    "hash" : "0x30c9ac56f97103bbc6e010bc21a4aba660330c50760a4431f97c4962563d0c0a",
-                    "mixHash" : "0x109d8f1c17727f978abccdebc78d61c59f930f69e4873a866d94e86e02d83944",
-                    "nonce" : "0x6a43689852c9b5b9",
-                    "number" : "0x01",
-                    "parentHash" : "0xbdedd777fb740dd7ab7ec6ee4dc3316fba8f1e9e3e35d771f3f4ebe5bfd3502d",
-                    "receiptTrie" : "0x210912c6ab3ca77d715087c57cb14563de6af0fba37ec5809a5507df5b616ba7",
-                    "stateRoot" : "0x0a64f428d18905cae0eb04af323a54a7fdfd3bbc1ab6ab43cfd06b9d90ceffb9",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0bdedd777fb740dd7ab7ec6ee4dc3316fba8f1e9e3e35d771f3f4ebe5bfd3502da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00a64f428d18905cae0eb04af323a54a7fdfd3bbc1ab6ab43cfd06b9d90ceffb9a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0210912c6ab3ca77d715087c57cb14563de6af0fba37ec5809a5507df5b616ba7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301588c8203e880a0109d8f1c17727f978abccdebc78d61c59f930f69e4873a866d94e86e02d83944886a43689852c9b5b9f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xbdedd777fb740dd7ab7ec6ee4dc3316fba8f1e9e3e35d771f3f4ebe5bfd3502d",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x1c693f3c846825385726e18830f89d87298bb2fd235d44b0452d00af43d06193",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c693f3c846825385726e18830f89d87298bb2fd235d44b0452d00af43d06193a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x30c9ac56f97103bbc6e010bc21a4aba660330c50760a4431f97c4962563d0c0a",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5588c",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762a774",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcallcode_101_OOGE_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/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "141b8653540e4595014ecd2412e1286f380cf9ee038d1622391425dab0674810"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x01588c",
-                    "hash" : "0x37cded086e63ab674b9cf5d5534843593b2454e71d283938c0511ad40b86cdc4",
-                    "mixHash" : "0xc00d0415e7d199981baf2b4a156f6d3bac5b2e3d008fc33ca8f6886c77a64439",
-                    "nonce" : "0x3077fc0148697626",
-                    "number" : "0x01",
-                    "parentHash" : "0xbdedd777fb740dd7ab7ec6ee4dc3316fba8f1e9e3e35d771f3f4ebe5bfd3502d",
-                    "receiptTrie" : "0x210912c6ab3ca77d715087c57cb14563de6af0fba37ec5809a5507df5b616ba7",
-                    "stateRoot" : "0x0a64f428d18905cae0eb04af323a54a7fdfd3bbc1ab6ab43cfd06b9d90ceffb9",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0bdedd777fb740dd7ab7ec6ee4dc3316fba8f1e9e3e35d771f3f4ebe5bfd3502da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00a64f428d18905cae0eb04af323a54a7fdfd3bbc1ab6ab43cfd06b9d90ceffb9a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0210912c6ab3ca77d715087c57cb14563de6af0fba37ec5809a5507df5b616ba7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301588c8203e880a0c00d0415e7d199981baf2b4a156f6d3bac5b2e3d008fc33ca8f6886c77a64439883077fc0148697626f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xbdedd777fb740dd7ab7ec6ee4dc3316fba8f1e9e3e35d771f3f4ebe5bfd3502d",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x1c693f3c846825385726e18830f89d87298bb2fd235d44b0452d00af43d06193",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c693f3c846825385726e18830f89d87298bb2fd235d44b0452d00af43d06193a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x37cded086e63ab674b9cf5d5534843593b2454e71d283938c0511ad40b86cdc4",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5588c",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762a774",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcallcode_101_OOGE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "141b8653540e4595014ecd2412e1286f380cf9ee038d1622391425dab0674810"
+            "sourceHash" : "67205bf65a4638c880f83a277c21ca55f9660a403fd4776ba33d5849c4705c64"
         },
         "blocks" : [
             {
@@ -469,9 +167,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "0x78da07f6167dc74d862c782bf62c5180a647a2dcc7426e3e746f7bd463b742a7",
-                    "mixHash" : "0xb8017549af56eee32061a58814287ffec1ebbb26b750daea2cf5b69dda3b13ab",
-                    "nonce" : "0x245b0e16addc9dea",
+                    "hash" : "0x38cf87deef75c38da16948915db3ad8c33c540ab049d7376b4443e96d13d5a20",
+                    "mixHash" : "0xf40a2f83997b6fbcda1b7dc23acacd354344ceeaeafc41d4990025d396dc9ada",
+                    "nonce" : "0xe122b6c7fa91a839",
                     "number" : "0x01",
                     "parentHash" : "0xbdedd777fb740dd7ab7ec6ee4dc3316fba8f1e9e3e35d771f3f4ebe5bfd3502d",
                     "receiptTrie" : "0x76ca5273e48a13040382b646f296d523750db807671380431faaa515e215517e",
@@ -480,10 +178,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0bdedd777fb740dd7ab7ec6ee4dc3316fba8f1e9e3e35d771f3f4ebe5bfd3502da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a58f95a4709d768b96c816eae6879007509447b8b799044aabd885793e34c605a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea076ca5273e48a13040382b646f296d523750db807671380431faaa515e215517eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0b8017549af56eee32061a58814287ffec1ebbb26b750daea2cf5b69dda3b13ab88245b0e16addc9deaf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0bdedd777fb740dd7ab7ec6ee4dc3316fba8f1e9e3e35d771f3f4ebe5bfd3502da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a58f95a4709d768b96c816eae6879007509447b8b799044aabd885793e34c605a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea076ca5273e48a13040382b646f296d523750db807671380431faaa515e215517eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0f40a2f83997b6fbcda1b7dc23acacd354344ceeaeafc41d4990025d396dc9ada88e122b6c7fa91a839f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -517,7 +215,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c693f3c846825385726e18830f89d87298bb2fd235d44b0452d00af43d06193a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x78da07f6167dc74d862c782bf62c5180a647a2dcc7426e3e746f7bd463b742a7",
+        "lastblockhash" : "0x38cf87deef75c38da16948915db3ad8c33c540ab049d7376b4443e96d13d5a20",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -600,156 +298,5 @@
                 }
             }
         }
-    },
-    "callcodecallcallcode_101_OOGE_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/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "141b8653540e4595014ecd2412e1286f380cf9ee038d1622391425dab0674810"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150d0",
-                    "hash" : "0x80875b36dc79596e0c4f94fda78568f018fdc03e2e6cbab2fbab44dcb3ff4c85",
-                    "mixHash" : "0x4943588a01a5acaad7144899206d1a73ce0d1e0a986ffc5b313a192d608bbc55",
-                    "nonce" : "0xac539ebcf09dcd54",
-                    "number" : "0x01",
-                    "parentHash" : "0xbdedd777fb740dd7ab7ec6ee4dc3316fba8f1e9e3e35d771f3f4ebe5bfd3502d",
-                    "receiptTrie" : "0x1e25caad7a731fe8a6e6d7af859481a549791ac8df8f831f76d218af68ea28be",
-                    "stateRoot" : "0xb78e37852a3e6a4432a4efb0e5af147da308c7d09e0cc1be66abe6534e546ce3",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0bdedd777fb740dd7ab7ec6ee4dc3316fba8f1e9e3e35d771f3f4ebe5bfd3502da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b78e37852a3e6a4432a4efb0e5af147da308c7d09e0cc1be66abe6534e546ce3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea01e25caad7a731fe8a6e6d7af859481a549791ac8df8f831f76d218af68ea28beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d08203e880a04943588a01a5acaad7144899206d1a73ce0d1e0a986ffc5b313a192d608bbc5588ac539ebcf09dcd54f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xbdedd777fb740dd7ab7ec6ee4dc3316fba8f1e9e3e35d771f3f4ebe5bfd3502d",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x1c693f3c846825385726e18830f89d87298bb2fd235d44b0452d00af43d06193",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c693f3c846825385726e18830f89d87298bb2fd235d44b0452d00af43d06193a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x80875b36dc79596e0c4f94fda78568f018fdc03e2e6cbab2fbab44dcb3ff4c85",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550d0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af30",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfter_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfter_d0g0v0.json
index 02c3b8bf6..384bea7ff 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfter_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfter_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "f4c6faa84a61a1d28cc74cac0703501706212e37c28958c98459e1465beb4122"
+            "sourceHash" : "7348a06de2383e06373d0147d9b39e0ca6a3098e037e9b9ede77c55353d44434"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155ff",
-                    "hash" : "0xcd537d00e5be8fc34569c0a63d606bc86cf28cf55330999d54d1c9c591eb97b4",
-                    "mixHash" : "0xa2b149ff65c4910e362f9cb012370eb7857bd0a02920298914c1e62b0df79b92",
-                    "nonce" : "0x2c65d1b64b3b4afc",
+                    "hash" : "0xf0ab2fab29826f2a96161d74315f79c6e40eb7fd10e562d551ec2a1700d4fba0",
+                    "mixHash" : "0xccd040a421476ff4fa0e6174eeb8079d5b0c0a2d9701a6612317b38fa6600d9d",
+                    "nonce" : "0x4da623e4ed0f4659",
                     "number" : "0x01",
                     "parentHash" : "0xc6ef54a48a603c37a4e703cec453388a288599ae78929191e2b6aa33aa38965b",
                     "receiptTrie" : "0x904ef34262912ab9ed82ebe8efcc7e7d10f885cb2a54713e6772e69cbee8b33c",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0c6ef54a48a603c37a4e703cec453388a288599ae78929191e2b6aa33aa38965ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d8c12ec1a145a2df667f70208f52320edb9c984abaf9a75b268a63a3421698efa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0904ef34262912ab9ed82ebe8efcc7e7d10f885cb2a54713e6772e69cbee8b33cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155ff8203e880a0a2b149ff65c4910e362f9cb012370eb7857bd0a02920298914c1e62b0df79b92882c65d1b64b3b4afcf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0c6ef54a48a603c37a4e703cec453388a288599ae78929191e2b6aa33aa38965ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d8c12ec1a145a2df667f70208f52320edb9c984abaf9a75b268a63a3421698efa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0904ef34262912ab9ed82ebe8efcc7e7d10f885cb2a54713e6772e69cbee8b33cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155ff8203e880a0ccd040a421476ff4fa0e6174eeb8079d5b0c0a2d9701a6612317b38fa6600d9d884da623e4ed0f4659f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6e3d55d5419754de209b45f7a60826251010d7bbb3c9b2b62c440c98da53b2fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcd537d00e5be8fc34569c0a63d606bc86cf28cf55330999d54d1c9c591eb97b4",
+        "lastblockhash" : "0xf0ab2fab29826f2a96161d74315f79c6e40eb7fd10e562d551ec2a1700d4fba0",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -149,313 +149,13 @@
             }
         }
     },
-    "callcodecallcallcode_101_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "f4c6faa84a61a1d28cc74cac0703501706212e37c28958c98459e1465beb4122"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155ff",
-                    "hash" : "0x0cfd4c08dadb46028eacae92d89e1221bfb8346fe6492e41dcc740550890f481",
-                    "mixHash" : "0xf15ea473733de1748621efef587a4b002c6e9b1ba688203d187c28879440bd59",
-                    "nonce" : "0xb8526027b735ec04",
-                    "number" : "0x01",
-                    "parentHash" : "0xc6ef54a48a603c37a4e703cec453388a288599ae78929191e2b6aa33aa38965b",
-                    "receiptTrie" : "0xc8e92577ec9ad352d64d260daa14f1a2df767271828d6cb565d692d8916d1f11",
-                    "stateRoot" : "0x92c76c3ab5142ae8f1fc2e69609e4af4febffa1bea15d9a60ddc3813316e90a6",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0c6ef54a48a603c37a4e703cec453388a288599ae78929191e2b6aa33aa38965ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa092c76c3ab5142ae8f1fc2e69609e4af4febffa1bea15d9a60ddc3813316e90a6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c8e92577ec9ad352d64d260daa14f1a2df767271828d6cb565d692d8916d1f11b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155ff8203e880a0f15ea473733de1748621efef587a4b002c6e9b1ba688203d187c28879440bd5988b8526027b735ec04f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xc6ef54a48a603c37a4e703cec453388a288599ae78929191e2b6aa33aa38965b",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb6e3d55d5419754de209b45f7a60826251010d7bbb3c9b2b62c440c98da53b2f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6e3d55d5419754de209b45f7a60826251010d7bbb3c9b2b62c440c98da53b2fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0cfd4c08dadb46028eacae92d89e1221bfb8346fe6492e41dcc740550890f481",
-        "network" : "EIP150",
-        "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_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/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "f4c6faa84a61a1d28cc74cac0703501706212e37c28958c98459e1465beb4122"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155ff",
-                    "hash" : "0xb2e831ccc58866ff19655d1628ce133082bb41434ee6769ed148f1cfb6416d7d",
-                    "mixHash" : "0x7fc65f0df4afe37dbfee0198681c1507a5c45adbcd17ff2aad4ec90c88f3f31f",
-                    "nonce" : "0x3f5032276c86ed47",
-                    "number" : "0x01",
-                    "parentHash" : "0xc6ef54a48a603c37a4e703cec453388a288599ae78929191e2b6aa33aa38965b",
-                    "receiptTrie" : "0xc8e92577ec9ad352d64d260daa14f1a2df767271828d6cb565d692d8916d1f11",
-                    "stateRoot" : "0x92c76c3ab5142ae8f1fc2e69609e4af4febffa1bea15d9a60ddc3813316e90a6",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0c6ef54a48a603c37a4e703cec453388a288599ae78929191e2b6aa33aa38965ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa092c76c3ab5142ae8f1fc2e69609e4af4febffa1bea15d9a60ddc3813316e90a6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c8e92577ec9ad352d64d260daa14f1a2df767271828d6cb565d692d8916d1f11b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155ff8203e880a07fc65f0df4afe37dbfee0198681c1507a5c45adbcd17ff2aad4ec90c88f3f31f883f5032276c86ed47f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xc6ef54a48a603c37a4e703cec453388a288599ae78929191e2b6aa33aa38965b",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb6e3d55d5419754de209b45f7a60826251010d7bbb3c9b2b62c440c98da53b2f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6e3d55d5419754de209b45f7a60826251010d7bbb3c9b2b62c440c98da53b2fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb2e831ccc58866ff19655d1628ce133082bb41434ee6769ed148f1cfb6416d7d",
-        "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_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "f4c6faa84a61a1d28cc74cac0703501706212e37c28958c98459e1465beb4122"
+            "sourceHash" : "7348a06de2383e06373d0147d9b39e0ca6a3098e037e9b9ede77c55353d44434"
         },
         "blocks" : [
             {
@@ -466,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "0x419651888dfb87b88611c894d861e8a964defd0c746c7f285123b19cecd356a2",
-                    "mixHash" : "0x026ebf8f40fb489bb5f78a0fd7ef9d7ee2f4e49baaf57a475fd00cfb86fb3160",
-                    "nonce" : "0xa005099c6ddf8dee",
+                    "hash" : "0x2ce5f84c185724f8f7992ae431867db497c5d5157758044a6411799f51cc30a0",
+                    "mixHash" : "0x652fe6028b192865b12a7fd3c2a7cfdd8922bfd74b7544da64981e0d808f8bc1",
+                    "nonce" : "0x8c49a2e3da9aed95",
                     "number" : "0x01",
                     "parentHash" : "0xc6ef54a48a603c37a4e703cec453388a288599ae78929191e2b6aa33aa38965b",
                     "receiptTrie" : "0x35d2c1620446175fe04bd2e38f488615f0476e6f412a858f374997ffa88cd2b5",
@@ -477,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0c6ef54a48a603c37a4e703cec453388a288599ae78929191e2b6aa33aa38965ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0383714aa98a691acdccf099e46648052b45ce6dd8ca97ccd346660a9e7dcc3e4a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea035d2c1620446175fe04bd2e38f488615f0476e6f412a858f374997ffa88cd2b5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0026ebf8f40fb489bb5f78a0fd7ef9d7ee2f4e49baaf57a475fd00cfb86fb316088a005099c6ddf8deef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0c6ef54a48a603c37a4e703cec453388a288599ae78929191e2b6aa33aa38965ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0383714aa98a691acdccf099e46648052b45ce6dd8ca97ccd346660a9e7dcc3e4a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea035d2c1620446175fe04bd2e38f488615f0476e6f412a858f374997ffa88cd2b5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0652fe6028b192865b12a7fd3c2a7cfdd8922bfd74b7544da64981e0d808f8bc1888c49a2e3da9aed95f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -514,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6e3d55d5419754de209b45f7a60826251010d7bbb3c9b2b62c440c98da53b2fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x419651888dfb87b88611c894d861e8a964defd0c746c7f285123b19cecd356a2",
+        "lastblockhash" : "0x2ce5f84c185724f8f7992ae431867db497c5d5157758044a6411799f51cc30a0",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -601,10 +301,10 @@
     "callcodecallcallcode_101_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "f4c6faa84a61a1d28cc74cac0703501706212e37c28958c98459e1465beb4122"
+            "sourceHash" : "7348a06de2383e06373d0147d9b39e0ca6a3098e037e9b9ede77c55353d44434"
         },
         "blocks" : [
             {
@@ -615,9 +315,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150c9",
-                    "hash" : "0xdaa3b858a31e1857e94a7030fd78d2316a0d4c1d24a28d9fbb4db8db87ccec05",
-                    "mixHash" : "0xe985069a19040fe7a3ff3d9c0b892f303238326a35731f81b323820fbea3de3c",
-                    "nonce" : "0xe24f744d9e1a2fd6",
+                    "hash" : "0x442c08760d65a29c047dc714f4a12c71fd8e638cc8139592d22fc281c59bf4f6",
+                    "mixHash" : "0x5e96c2c745beeb1918224426baf181f39dadf723b2340380be773c1c4aec0544",
+                    "nonce" : "0x2a123f839ce17c26",
                     "number" : "0x01",
                     "parentHash" : "0xc6ef54a48a603c37a4e703cec453388a288599ae78929191e2b6aa33aa38965b",
                     "receiptTrie" : "0x103cd4aa2e002867e45d81282907befbf9ca183c1a6816f94cb1e78b8c39f206",
@@ -626,10 +326,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0c6ef54a48a603c37a4e703cec453388a288599ae78929191e2b6aa33aa38965ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e9206d98842c36b016825e42ca5ba02f2644586033ecd10b646180572a11019a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0103cd4aa2e002867e45d81282907befbf9ca183c1a6816f94cb1e78b8c39f206b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150c98203e880a0e985069a19040fe7a3ff3d9c0b892f303238326a35731f81b323820fbea3de3c88e24f744d9e1a2fd6f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0c6ef54a48a603c37a4e703cec453388a288599ae78929191e2b6aa33aa38965ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e9206d98842c36b016825e42ca5ba02f2644586033ecd10b646180572a11019a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0103cd4aa2e002867e45d81282907befbf9ca183c1a6816f94cb1e78b8c39f206b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150c98203e880a05e96c2c745beeb1918224426baf181f39dadf723b2340380be773c1c4aec0544882a123f839ce17c26f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -663,7 +363,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6e3d55d5419754de209b45f7a60826251010d7bbb3c9b2b62c440c98da53b2fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdaa3b858a31e1857e94a7030fd78d2316a0d4c1d24a28d9fbb4db8db87ccec05",
+        "lastblockhash" : "0x442c08760d65a29c047dc714f4a12c71fd8e638cc8139592d22fc281c59bf4f6",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBefore_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBefore_d0g0v0.json
index e167366e5..023bdec75 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBefore_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBefore_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_OOGMBefore_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "d7b729ee7ea2a719edc4971a19f553ee028efcba4ceff944d2579207f744b2cb"
+            "sourceHash" : "f6c256ae3d95a3753b1dbd197c1b81d958153bf09641721f11f5e3bb6badb5ea"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f1",
-                    "hash" : "0x7c98476e48f31f83bea1082feb66a65a82c2700f63abac874acaf24026c0edf0",
-                    "mixHash" : "0x18de79ae939183a0872a70e05fc635f350ad9518b2c85c8e7de24b53b4555592",
-                    "nonce" : "0x217d1fbe61347158",
+                    "hash" : "0xb71596730b1fe53d1d6cead68a3a6f6d5fd8cc87abaed0be744082ee829d67d4",
+                    "mixHash" : "0xd28dab92d050070eccfc80a6c60d1c3d395843777b4373a29d2cb350ec75214c",
+                    "nonce" : "0x5511af6d5dc68b3c",
                     "number" : "0x01",
                     "parentHash" : "0x962b422d8609bae64c9c6bca0a8674afb56840f3fe8f7bb5d4b32a2ba02fb86f",
                     "receiptTrie" : "0x577da455939dbfab0531e9b7f91c9084d2faeaf47e5372ecf6e9f1d584298fcf",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0962b422d8609bae64c9c6bca0a8674afb56840f3fe8f7bb5d4b32a2ba02fb86fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03689665969c2004cf5814c423b9e8af73ff9ea324144290d35b55d6141477d7ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0577da455939dbfab0531e9b7f91c9084d2faeaf47e5372ecf6e9f1d584298fcfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f18203e880a018de79ae939183a0872a70e05fc635f350ad9518b2c85c8e7de24b53b455559288217d1fbe61347158f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0962b422d8609bae64c9c6bca0a8674afb56840f3fe8f7bb5d4b32a2ba02fb86fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03689665969c2004cf5814c423b9e8af73ff9ea324144290d35b55d6141477d7ba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0577da455939dbfab0531e9b7f91c9084d2faeaf47e5372ecf6e9f1d584298fcfb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f18203e880a0d28dab92d050070eccfc80a6c60d1c3d395843777b4373a29d2cb350ec75214c885511af6d5dc68b3cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d12b3843a4eba9dac34077332716c7d07254b0de552f824ba0e72140b62d47c8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7c98476e48f31f83bea1082feb66a65a82c2700f63abac874acaf24026c0edf0",
+        "lastblockhash" : "0xb71596730b1fe53d1d6cead68a3a6f6d5fd8cc87abaed0be744082ee829d67d4",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -149,313 +149,13 @@
             }
         }
     },
-    "callcodecallcallcode_101_OOGMBefore_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "d7b729ee7ea2a719edc4971a19f553ee028efcba4ceff944d2579207f744b2cb"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155f1",
-                    "hash" : "0x91993826cb7d62452e9c110d50d74404746692bb7e3904dbd73924ff70453e96",
-                    "mixHash" : "0x0a75c053c0b9296c3e2b32e3e14143482f275d03e8491885abf79ec9a563c7f9",
-                    "nonce" : "0xa567cf1585a9ee66",
-                    "number" : "0x01",
-                    "parentHash" : "0x962b422d8609bae64c9c6bca0a8674afb56840f3fe8f7bb5d4b32a2ba02fb86f",
-                    "receiptTrie" : "0x1f00d1896c6c5694d2a96f81a2c7b4d921a06be00a04ad6eba481666303261c3",
-                    "stateRoot" : "0x57fff010971ff1e9511842e71976bf8e7de7a28d76f1f2e1a93675866de9c1ce",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0962b422d8609bae64c9c6bca0a8674afb56840f3fe8f7bb5d4b32a2ba02fb86fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057fff010971ff1e9511842e71976bf8e7de7a28d76f1f2e1a93675866de9c1cea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea01f00d1896c6c5694d2a96f81a2c7b4d921a06be00a04ad6eba481666303261c3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f18203e880a00a75c053c0b9296c3e2b32e3e14143482f275d03e8491885abf79ec9a563c7f988a567cf1585a9ee66f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x962b422d8609bae64c9c6bca0a8674afb56840f3fe8f7bb5d4b32a2ba02fb86f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xd12b3843a4eba9dac34077332716c7d07254b0de552f824ba0e72140b62d47c8",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d12b3843a4eba9dac34077332716c7d07254b0de552f824ba0e72140b62d47c8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x91993826cb7d62452e9c110d50d74404746692bb7e3904dbd73924ff70453e96",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555f1",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa0f",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcallcode_101_OOGMBefore_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/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "d7b729ee7ea2a719edc4971a19f553ee028efcba4ceff944d2579207f744b2cb"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155f1",
-                    "hash" : "0x6bf7b53346c9d2237debdfad0c37dcca20b4226cc012a654e184aa475ad5e520",
-                    "mixHash" : "0xc93a51db16f27634f5d53e00f9e0207e2fd83da3cbd95700314412211aa6b8d2",
-                    "nonce" : "0x34526dc2b0adfb5e",
-                    "number" : "0x01",
-                    "parentHash" : "0x962b422d8609bae64c9c6bca0a8674afb56840f3fe8f7bb5d4b32a2ba02fb86f",
-                    "receiptTrie" : "0x1f00d1896c6c5694d2a96f81a2c7b4d921a06be00a04ad6eba481666303261c3",
-                    "stateRoot" : "0x57fff010971ff1e9511842e71976bf8e7de7a28d76f1f2e1a93675866de9c1ce",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0962b422d8609bae64c9c6bca0a8674afb56840f3fe8f7bb5d4b32a2ba02fb86fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa057fff010971ff1e9511842e71976bf8e7de7a28d76f1f2e1a93675866de9c1cea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea01f00d1896c6c5694d2a96f81a2c7b4d921a06be00a04ad6eba481666303261c3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f18203e880a0c93a51db16f27634f5d53e00f9e0207e2fd83da3cbd95700314412211aa6b8d28834526dc2b0adfb5ef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x962b422d8609bae64c9c6bca0a8674afb56840f3fe8f7bb5d4b32a2ba02fb86f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xd12b3843a4eba9dac34077332716c7d07254b0de552f824ba0e72140b62d47c8",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d12b3843a4eba9dac34077332716c7d07254b0de552f824ba0e72140b62d47c8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6bf7b53346c9d2237debdfad0c37dcca20b4226cc012a654e184aa475ad5e520",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555f1",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa0f",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcallcode_101_OOGMBefore_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "d7b729ee7ea2a719edc4971a19f553ee028efcba4ceff944d2579207f744b2cb"
+            "sourceHash" : "f6c256ae3d95a3753b1dbd197c1b81d958153bf09641721f11f5e3bb6badb5ea"
         },
         "blocks" : [
             {
@@ -466,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "0x0b75702eef45348735eab64db530a1f3c2ba3190dc887f7c2ff6c761f9a6c388",
-                    "mixHash" : "0xfbf395dfcf868dbde89972199847905163ce0bda2dc0695c225de9739f479434",
-                    "nonce" : "0x6781c922b9a8f14b",
+                    "hash" : "0x1676f46a54123ab2a84a645f7ebd449abaf4b8c48e58e208e67ccb5187dbe238",
+                    "mixHash" : "0xcba98ffb11e0148541a126b8d45a33b3d0734cf5c610a2acf3db6a6903c5dae6",
+                    "nonce" : "0xf67beae54d006242",
                     "number" : "0x01",
                     "parentHash" : "0x962b422d8609bae64c9c6bca0a8674afb56840f3fe8f7bb5d4b32a2ba02fb86f",
                     "receiptTrie" : "0xadc8d94f66deae9ecbbc7dc5f9f41ea37c8dbe25ae24062ad527f5d39f9e7025",
@@ -477,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0962b422d8609bae64c9c6bca0a8674afb56840f3fe8f7bb5d4b32a2ba02fb86fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a419cfe3a4fe275b372d65c68effae58e0540c92c9a1dbfcf2e6b17b642b2495a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0adc8d94f66deae9ecbbc7dc5f9f41ea37c8dbe25ae24062ad527f5d39f9e7025b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0fbf395dfcf868dbde89972199847905163ce0bda2dc0695c225de9739f479434886781c922b9a8f14bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0962b422d8609bae64c9c6bca0a8674afb56840f3fe8f7bb5d4b32a2ba02fb86fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a419cfe3a4fe275b372d65c68effae58e0540c92c9a1dbfcf2e6b17b642b2495a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0adc8d94f66deae9ecbbc7dc5f9f41ea37c8dbe25ae24062ad527f5d39f9e7025b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0cba98ffb11e0148541a126b8d45a33b3d0734cf5c610a2acf3db6a6903c5dae688f67beae54d006242f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -514,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d12b3843a4eba9dac34077332716c7d07254b0de552f824ba0e72140b62d47c8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0b75702eef45348735eab64db530a1f3c2ba3190dc887f7c2ff6c761f9a6c388",
+        "lastblockhash" : "0x1676f46a54123ab2a84a645f7ebd449abaf4b8c48e58e208e67ccb5187dbe238",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -597,155 +297,5 @@
                 }
             }
         }
-    },
-    "callcodecallcallcode_101_OOGMBefore_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/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "d7b729ee7ea2a719edc4971a19f553ee028efcba4ceff944d2579207f744b2cb"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150c9",
-                    "hash" : "0x144dbb4a0750efedf283eb6afa3c301b88b0f6aedfd7f41a005841ec414c5b94",
-                    "mixHash" : "0xb484978b76f5d70ab48ac0149c324248b80fd225706d1d28dc953859164338c2",
-                    "nonce" : "0x0dd83a6046b91e90",
-                    "number" : "0x01",
-                    "parentHash" : "0x962b422d8609bae64c9c6bca0a8674afb56840f3fe8f7bb5d4b32a2ba02fb86f",
-                    "receiptTrie" : "0x638c4b58e8f51513d56d743bd06f83fa76ce6350974c93bbba851a3302dd1444",
-                    "stateRoot" : "0x0016ca6bf7cdb286bb0b3704fb3f30e3da1aca47f52acfb18a918673dc1779d3",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0962b422d8609bae64c9c6bca0a8674afb56840f3fe8f7bb5d4b32a2ba02fb86fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00016ca6bf7cdb286bb0b3704fb3f30e3da1aca47f52acfb18a918673dc1779d3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0638c4b58e8f51513d56d743bd06f83fa76ce6350974c93bbba851a3302dd1444b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150c98203e880a0b484978b76f5d70ab48ac0149c324248b80fd225706d1d28dc953859164338c2880dd83a6046b91e90f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x962b422d8609bae64c9c6bca0a8674afb56840f3fe8f7bb5d4b32a2ba02fb86f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xd12b3843a4eba9dac34077332716c7d07254b0de552f824ba0e72140b62d47c8",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d12b3843a4eba9dac34077332716c7d07254b0de552f824ba0e72140b62d47c8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x144dbb4a0750efedf283eb6afa3c301b88b0f6aedfd7f41a005841ec414c5b94",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "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" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002619c90f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "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/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEnd_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEnd_d0g0v0.json
index bf71d3b70..c1a8a533a 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEnd_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEnd_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_SuicideEnd_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "8b90edae09d781e4242bcd6ca1f7ac1ce7afbb8928ef92beca77eae12446f062"
+            "sourceHash" : "0c8d7540dfbe24070597091acb96fcf7f37a391e3861274c7219f624a4969254"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e1",
-                    "hash" : "0xf1de1829a8e9c33e216c5d4dcccb64033842949fe9e7f6a2d0045e8909878c56",
-                    "mixHash" : "0x71116dda49272f3bd5ff2b3f4313162e6f55b8a4980789b629a18f1b47a8db4c",
-                    "nonce" : "0x3202f3b90e301bac",
+                    "hash" : "0xbdbc40959f88fca275379f6e8499177520c4afb7b24d275210f904a507512222",
+                    "mixHash" : "0x4b754f003f5fe59f327df5865cdf0c6ca6528cd41ab562638f4a545331846d15",
+                    "nonce" : "0x8d4a8ba097c66db6",
                     "number" : "0x01",
                     "parentHash" : "0x854e8b29f23f5127ad56cea1d0d7b3cc5a197ffac69b0647d37a7f48b632e19d",
                     "receiptTrie" : "0xcf9330598ab7451b4f09a6b088820b464ad884bf3a1d818226bd82ec45c18b0d",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0854e8b29f23f5127ad56cea1d0d7b3cc5a197ffac69b0647d37a7f48b632e19da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0177ea6a447e2a1c5b90dc0f879dfd8d20d1ebd07564535c26f0d0d154c7fd09aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0cf9330598ab7451b4f09a6b088820b464ad884bf3a1d818226bd82ec45c18b0db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e18203e880a071116dda49272f3bd5ff2b3f4313162e6f55b8a4980789b629a18f1b47a8db4c883202f3b90e301bacf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0854e8b29f23f5127ad56cea1d0d7b3cc5a197ffac69b0647d37a7f48b632e19da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0177ea6a447e2a1c5b90dc0f879dfd8d20d1ebd07564535c26f0d0d154c7fd09aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0cf9330598ab7451b4f09a6b088820b464ad884bf3a1d818226bd82ec45c18b0db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e18203e880a04b754f003f5fe59f327df5865cdf0c6ca6528cd41ab562638f4a545331846d15888d4a8ba097c66db6f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c64bc8ce655a95c30a125859aba40857d9e202e34ceb0dcae35af57aca2493ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf1de1829a8e9c33e216c5d4dcccb64033842949fe9e7f6a2d0045e8909878c56",
+        "lastblockhash" : "0xbdbc40959f88fca275379f6e8499177520c4afb7b24d275210f904a507512222",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -141,297 +141,13 @@
             }
         }
     },
-    "callcodecallcallcode_101_SuicideEnd_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "8b90edae09d781e4242bcd6ca1f7ac1ce7afbb8928ef92beca77eae12446f062"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0148e1",
-                    "hash" : "0xf7fd9babc62ae3a59c850ddae5ee5319608f6faeaabebc41c23ad1062c3231b8",
-                    "mixHash" : "0x376d093109c8d8baf7821b81e88ded2da1f25d44b02c7f3e3f40b44ab5fcb7d8",
-                    "nonce" : "0xb705963696f761ff",
-                    "number" : "0x01",
-                    "parentHash" : "0x854e8b29f23f5127ad56cea1d0d7b3cc5a197ffac69b0647d37a7f48b632e19d",
-                    "receiptTrie" : "0x8cba015ac3e87fc169e1cdb0650958beff6bbd5150918d023737ec1dfbeefeb2",
-                    "stateRoot" : "0x261e25303f61599dcb249be49faafc9bfc5ab7c579e22f48c75e2293a26acd61",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0854e8b29f23f5127ad56cea1d0d7b3cc5a197ffac69b0647d37a7f48b632e19da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0261e25303f61599dcb249be49faafc9bfc5ab7c579e22f48c75e2293a26acd61a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a08cba015ac3e87fc169e1cdb0650958beff6bbd5150918d023737ec1dfbeefeb2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e18203e880a0376d093109c8d8baf7821b81e88ded2da1f25d44b02c7f3e3f40b44ab5fcb7d888b705963696f761fff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x854e8b29f23f5127ad56cea1d0d7b3cc5a197ffac69b0647d37a7f48b632e19d",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x1c64bc8ce655a95c30a125859aba40857d9e202e34ceb0dcae35af57aca2493b",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c64bc8ce655a95c30a125859aba40857d9e202e34ceb0dcae35af57aca2493ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf7fd9babc62ae3a59c850ddae5ee5319608f6faeaabebc41c23ad1062c3231b8",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b5fb6fe400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000361c350f4600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548e1",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762b71f",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000361c350f4600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcallcode_101_SuicideEnd_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/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "8b90edae09d781e4242bcd6ca1f7ac1ce7afbb8928ef92beca77eae12446f062"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0148e1",
-                    "hash" : "0x3b677370b6876e85c8564a6ec330fc6c6239c75a828821d02c98aecb753b93ca",
-                    "mixHash" : "0xb608f67f265d81ea599e05b03bdcd3dd69a73b5350673ab93fb46a416bf69ebb",
-                    "nonce" : "0xdb1be9d17e3c9e0f",
-                    "number" : "0x01",
-                    "parentHash" : "0x854e8b29f23f5127ad56cea1d0d7b3cc5a197ffac69b0647d37a7f48b632e19d",
-                    "receiptTrie" : "0x8cba015ac3e87fc169e1cdb0650958beff6bbd5150918d023737ec1dfbeefeb2",
-                    "stateRoot" : "0x261e25303f61599dcb249be49faafc9bfc5ab7c579e22f48c75e2293a26acd61",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0854e8b29f23f5127ad56cea1d0d7b3cc5a197ffac69b0647d37a7f48b632e19da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0261e25303f61599dcb249be49faafc9bfc5ab7c579e22f48c75e2293a26acd61a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a08cba015ac3e87fc169e1cdb0650958beff6bbd5150918d023737ec1dfbeefeb2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e18203e880a0b608f67f265d81ea599e05b03bdcd3dd69a73b5350673ab93fb46a416bf69ebb88db1be9d17e3c9e0ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x854e8b29f23f5127ad56cea1d0d7b3cc5a197ffac69b0647d37a7f48b632e19d",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x1c64bc8ce655a95c30a125859aba40857d9e202e34ceb0dcae35af57aca2493b",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c64bc8ce655a95c30a125859aba40857d9e202e34ceb0dcae35af57aca2493ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3b677370b6876e85c8564a6ec330fc6c6239c75a828821d02c98aecb753b93ca",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b5fb6fe400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000361c350f4600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548e1",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762b71f",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000361c350f4600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcallcode_101_SuicideEnd_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "8b90edae09d781e4242bcd6ca1f7ac1ce7afbb8928ef92beca77eae12446f062"
+            "sourceHash" : "0c8d7540dfbe24070597091acb96fcf7f37a391e3861274c7219f624a4969254"
         },
         "blocks" : [
             {
@@ -442,9 +158,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x12743a42070ce238e8f487afb7cd843085ec3307a8ed9da8db687dc0574379dd",
-                    "mixHash" : "0xe32bfe71337fe9a263136f4d304576598468a307a64fc797516c3387fffc5abd",
-                    "nonce" : "0x2f80800f20ad01b9",
+                    "hash" : "0x2f9204ecd8af8a15fef5723af4bfeab41dd00a4bd40b4136131342ef991f26fd",
+                    "mixHash" : "0x859458dd125928b8b3e19ff9a264e6106830eba6bb142b4bb3b5020857e6e845",
+                    "nonce" : "0x9aa364d88c19fabc",
                     "number" : "0x01",
                     "parentHash" : "0x854e8b29f23f5127ad56cea1d0d7b3cc5a197ffac69b0647d37a7f48b632e19d",
                     "receiptTrie" : "0x402b21cdcb24f5debfce5cd246f4142816d51ca3f071ca5318b7c5ebb71d94c9",
@@ -453,10 +169,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0854e8b29f23f5127ad56cea1d0d7b3cc5a197ffac69b0647d37a7f48b632e19da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01db5d9c8ca50b0601ec9414889b513ab852881aef2d777314a430a1ce51b06d1a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0402b21cdcb24f5debfce5cd246f4142816d51ca3f071ca5318b7c5ebb71d94c9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0e32bfe71337fe9a263136f4d304576598468a307a64fc797516c3387fffc5abd882f80800f20ad01b9f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0854e8b29f23f5127ad56cea1d0d7b3cc5a197ffac69b0647d37a7f48b632e19da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01db5d9c8ca50b0601ec9414889b513ab852881aef2d777314a430a1ce51b06d1a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0402b21cdcb24f5debfce5cd246f4142816d51ca3f071ca5318b7c5ebb71d94c9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0859458dd125928b8b3e19ff9a264e6106830eba6bb142b4bb3b5020857e6e845889aa364d88c19fabcf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -490,7 +206,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c64bc8ce655a95c30a125859aba40857d9e202e34ceb0dcae35af57aca2493ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x12743a42070ce238e8f487afb7cd843085ec3307a8ed9da8db687dc0574379dd",
+        "lastblockhash" : "0x2f9204ecd8af8a15fef5723af4bfeab41dd00a4bd40b4136131342ef991f26fd",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -573,147 +289,5 @@
                 }
             }
         }
-    },
-    "callcodecallcallcode_101_SuicideEnd_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/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "8b90edae09d781e4242bcd6ca1f7ac1ce7afbb8928ef92beca77eae12446f062"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x012d9d",
-                    "hash" : "0xa41afd20e5b1975e33a10a6a24c6d104414e16ad1b0fb9bc0fb178eccdf01907",
-                    "mixHash" : "0x2d8492121e084019d0b80e5766127f17b4e5e0d6d547f39ab263e21306f46bac",
-                    "nonce" : "0x8a21cafda1fb71e4",
-                    "number" : "0x01",
-                    "parentHash" : "0x854e8b29f23f5127ad56cea1d0d7b3cc5a197ffac69b0647d37a7f48b632e19d",
-                    "receiptTrie" : "0x32f393cc0bf78248dbff7c28e8b615e9294b550afb67afb2a68866b648120633",
-                    "stateRoot" : "0x8af30e11a386fb975429d5aee64539ab228c583481165a410c9f53d4256a41c5",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0854e8b29f23f5127ad56cea1d0d7b3cc5a197ffac69b0647d37a7f48b632e19da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08af30e11a386fb975429d5aee64539ab228c583481165a410c9f53d4256a41c5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a032f393cc0bf78248dbff7c28e8b615e9294b550afb67afb2a68866b648120633b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012d9d8203e880a02d8492121e084019d0b80e5766127f17b4e5e0d6d547f39ab263e21306f46bac888a21cafda1fb71e4f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x854e8b29f23f5127ad56cea1d0d7b3cc5a197ffac69b0647d37a7f48b632e19d",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x1c64bc8ce655a95c30a125859aba40857d9e202e34ceb0dcae35af57aca2493b",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01c64bc8ce655a95c30a125859aba40857d9e202e34ceb0dcae35af57aca2493ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa41afd20e5b1975e33a10a6a24c6d104414e16ad1b0fb9bc0fb178eccdf01907",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b5fb6fe400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000361c350f4600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f52d9d",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762d263",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000361c350f4600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddle_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddle_d0g0v0.json
index d13922b78..2e3644511 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddle_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddle_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_SuicideMiddle_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "861cf43f05097eb05f7d26e93f658ea74cc383eee891c94041f615426ecd4828"
+            "sourceHash" : "cf3f1bf2cbdf8cf4de45e4c5cbf3105a01b94ca6b4dc640d29fcebada8e56ade"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c4",
-                    "hash" : "0x3f1ca91268b566f08bc81bf3e767375e350869415f526eb6dd5b13d459b700aa",
-                    "mixHash" : "0xdc57fbecd286d9ed2587e81a90dacec8a98a657235f6ce67d95f91d5cc9a6dea",
-                    "nonce" : "0x051f481f7301ca84",
+                    "hash" : "0xfda83b77e196720a4de17571fe87f214326cabb8d890deb794087381ba92e665",
+                    "mixHash" : "0x84aa96a4f0c7502ad1ac3de2dcadf1b195b79e928693e8c926187bc52b348e5b",
+                    "nonce" : "0x521053c239233f19",
                     "number" : "0x01",
                     "parentHash" : "0x1107950d2f9639aed59666e6ed2a5e7bcd9a09b1ffbc1c2109e833cc61ffd8f6",
                     "receiptTrie" : "0x9cfe338f99c36eb562687de6302f5f1018f7c7847c8593f83122637b4e445fb2",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01107950d2f9639aed59666e6ed2a5e7bcd9a09b1ffbc1c2109e833cc61ffd8f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b5e871853974d6087e3cf35a9c91b5dcc62d856667f2e3fa6eace78536c32a0ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09cfe338f99c36eb562687de6302f5f1018f7c7847c8593f83122637b4e445fb2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c48203e880a0dc57fbecd286d9ed2587e81a90dacec8a98a657235f6ce67d95f91d5cc9a6dea88051f481f7301ca84f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a01107950d2f9639aed59666e6ed2a5e7bcd9a09b1ffbc1c2109e833cc61ffd8f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b5e871853974d6087e3cf35a9c91b5dcc62d856667f2e3fa6eace78536c32a0ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09cfe338f99c36eb562687de6302f5f1018f7c7847c8593f83122637b4e445fb2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c48203e880a084aa96a4f0c7502ad1ac3de2dcadf1b195b79e928693e8c926187bc52b348e5b88521053c239233f19f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09835fad0c00f1b4a7b4f0c1f3ccffb10a0150f4506371032ac72eb7ebb0ff213a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3f1ca91268b566f08bc81bf3e767375e350869415f526eb6dd5b13d459b700aa",
+        "lastblockhash" : "0xfda83b77e196720a4de17571fe87f214326cabb8d890deb794087381ba92e665",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -141,297 +141,13 @@
             }
         }
     },
-    "callcodecallcallcode_101_SuicideMiddle_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "861cf43f05097eb05f7d26e93f658ea74cc383eee891c94041f615426ecd4828"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c4",
-                    "hash" : "0x9759dacc3a68f923990f44916de1e2c02fbb21a33cd9a53ae52d9a11a074bd99",
-                    "mixHash" : "0xe6f37e717edafcd60bd57c0fd6c73b1ae3269b6a6eda0421eed770d0c4a42487",
-                    "nonce" : "0x8f63f89f64a57bb4",
-                    "number" : "0x01",
-                    "parentHash" : "0x1107950d2f9639aed59666e6ed2a5e7bcd9a09b1ffbc1c2109e833cc61ffd8f6",
-                    "receiptTrie" : "0xc4f09ffcdc227760cdfee2210415ea90357675b0c39525511ee3e0ef08c5f2d4",
-                    "stateRoot" : "0x9d21a0ab0eba44f0e437ad04d3c8aecd60a66ebad92ef931a5c42336555f9121",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a01107950d2f9639aed59666e6ed2a5e7bcd9a09b1ffbc1c2109e833cc61ffd8f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09d21a0ab0eba44f0e437ad04d3c8aecd60a66ebad92ef931a5c42336555f9121a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c4f09ffcdc227760cdfee2210415ea90357675b0c39525511ee3e0ef08c5f2d4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c48203e880a0e6f37e717edafcd60bd57c0fd6c73b1ae3269b6a6eda0421eed770d0c4a42487888f63f89f64a57bb4f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x1107950d2f9639aed59666e6ed2a5e7bcd9a09b1ffbc1c2109e833cc61ffd8f6",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x9835fad0c00f1b4a7b4f0c1f3ccffb10a0150f4506371032ac72eb7ebb0ff213",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09835fad0c00f1b4a7b4f0c1f3ccffb10a0150f4506371032ac72eb7ebb0ff213a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9759dacc3a68f923990f44916de1e2c02fbb21a33cd9a53ae52d9a11a074bd99",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c4",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a763563c",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcallcode_101_SuicideMiddle_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/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "861cf43f05097eb05f7d26e93f658ea74cc383eee891c94041f615426ecd4828"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c4",
-                    "hash" : "0x62e794e598214d35b10f061c21bf83715bc391e30f683f7e15ff08355af69b9e",
-                    "mixHash" : "0xf0bab44e7ad407b35a53337c93f9af2a0fd233754b5419077bad80293249b13c",
-                    "nonce" : "0x1d9fdbe723241ec6",
-                    "number" : "0x01",
-                    "parentHash" : "0x1107950d2f9639aed59666e6ed2a5e7bcd9a09b1ffbc1c2109e833cc61ffd8f6",
-                    "receiptTrie" : "0xc4f09ffcdc227760cdfee2210415ea90357675b0c39525511ee3e0ef08c5f2d4",
-                    "stateRoot" : "0x9d21a0ab0eba44f0e437ad04d3c8aecd60a66ebad92ef931a5c42336555f9121",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a01107950d2f9639aed59666e6ed2a5e7bcd9a09b1ffbc1c2109e833cc61ffd8f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09d21a0ab0eba44f0e437ad04d3c8aecd60a66ebad92ef931a5c42336555f9121a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0c4f09ffcdc227760cdfee2210415ea90357675b0c39525511ee3e0ef08c5f2d4b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c48203e880a0f0bab44e7ad407b35a53337c93f9af2a0fd233754b5419077bad80293249b13c881d9fdbe723241ec6f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x1107950d2f9639aed59666e6ed2a5e7bcd9a09b1ffbc1c2109e833cc61ffd8f6",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x9835fad0c00f1b4a7b4f0c1f3ccffb10a0150f4506371032ac72eb7ebb0ff213",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09835fad0c00f1b4a7b4f0c1f3ccffb10a0150f4506371032ac72eb7ebb0ff213a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x62e794e598214d35b10f061c21bf83715bc391e30f683f7e15ff08355af69b9e",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c4",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a763563c",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcallcode_101_SuicideMiddle_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "861cf43f05097eb05f7d26e93f658ea74cc383eee891c94041f615426ecd4828"
+            "sourceHash" : "cf3f1bf2cbdf8cf4de45e4c5cbf3105a01b94ca6b4dc640d29fcebada8e56ade"
         },
         "blocks" : [
             {
@@ -442,9 +158,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x782292232b71b6ddff3458146d3547c2a575beecf30b691deb1f8f94ceeb19b6",
-                    "mixHash" : "0x655edfa7ba1705513417ac702d9ed7206171869ce2c76b4fccaf76954688fd16",
-                    "nonce" : "0x54a744bc337099dd",
+                    "hash" : "0xdecebea1a26d2bfcef787b0a2f0a79cacee1409767946ce36e651a9d35077411",
+                    "mixHash" : "0x69e8508537c80e152def410aa170ce47c05e96398d516f3a939aa789b240d632",
+                    "nonce" : "0x35b49ba618854898",
                     "number" : "0x01",
                     "parentHash" : "0x1107950d2f9639aed59666e6ed2a5e7bcd9a09b1ffbc1c2109e833cc61ffd8f6",
                     "receiptTrie" : "0x34e39ad3c36115d8ee5c5b2e339924c012d546f802f31f5f99efcdf421a617c5",
@@ -453,10 +169,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a01107950d2f9639aed59666e6ed2a5e7bcd9a09b1ffbc1c2109e833cc61ffd8f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4a0148ed8cb1f3acaa39c32e10ef7502b61b95aa1a20d5e0031ff24a2766124a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a034e39ad3c36115d8ee5c5b2e339924c012d546f802f31f5f99efcdf421a617c5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0655edfa7ba1705513417ac702d9ed7206171869ce2c76b4fccaf76954688fd168854a744bc337099ddf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a01107950d2f9639aed59666e6ed2a5e7bcd9a09b1ffbc1c2109e833cc61ffd8f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b4a0148ed8cb1f3acaa39c32e10ef7502b61b95aa1a20d5e0031ff24a2766124a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a034e39ad3c36115d8ee5c5b2e339924c012d546f802f31f5f99efcdf421a617c5b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a069e8508537c80e152def410aa170ce47c05e96398d516f3a939aa789b240d6328835b49ba618854898f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -490,7 +206,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09835fad0c00f1b4a7b4f0c1f3ccffb10a0150f4506371032ac72eb7ebb0ff213a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x782292232b71b6ddff3458146d3547c2a575beecf30b691deb1f8f94ceeb19b6",
+        "lastblockhash" : "0xdecebea1a26d2bfcef787b0a2f0a79cacee1409767946ce36e651a9d35077411",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -573,147 +289,5 @@
                 }
             }
         }
-    },
-    "callcodecallcallcode_101_SuicideMiddle_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/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "861cf43f05097eb05f7d26e93f658ea74cc383eee891c94041f615426ecd4828"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x9114",
-                    "hash" : "0xa2436c2301606b307c349b610eb1b1575fab2142bc0e7b9e8d3f58bacb57bf9e",
-                    "mixHash" : "0x96eac3fe6da6ce0d85b6b19a1488050a85dacba91d79c6e3e26c9e10583c651d",
-                    "nonce" : "0x2103c834c2fb1fd9",
-                    "number" : "0x01",
-                    "parentHash" : "0x1107950d2f9639aed59666e6ed2a5e7bcd9a09b1ffbc1c2109e833cc61ffd8f6",
-                    "receiptTrie" : "0x07659094e21646a3bee9c66557be5aa89985898f03d7f0b7be87f1ddcfb36551",
-                    "stateRoot" : "0x6c87b766b264a7f087351fce8084d033811c7f4895255476e784e272deeb51f9",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a01107950d2f9639aed59666e6ed2a5e7bcd9a09b1ffbc1c2109e833cc61ffd8f6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c87b766b264a7f087351fce8084d033811c7f4895255476e784e272deeb51f9a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a007659094e21646a3bee9c66557be5aa89985898f03d7f0b7be87f1ddcfb36551b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291148203e880a096eac3fe6da6ce0d85b6b19a1488050a85dacba91d79c6e3e26c9e10583c651d882103c834c2fb1fd9f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x1107950d2f9639aed59666e6ed2a5e7bcd9a09b1ffbc1c2109e833cc61ffd8f6",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x9835fad0c00f1b4a7b4f0c1f3ccffb10a0150f4506371032ac72eb7ebb0ff213",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09835fad0c00f1b4a7b4f0c1f3ccffb10a0150f4506371032ac72eb7ebb0ff213a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa2436c2301606b307c349b610eb1b1575fab2142bc0e7b9e8d3f58bacb57bf9e",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49114",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7636eec",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620186a0f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_d0g0v0.json
index d729fe7ce..d0b8fec5d 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_101_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_d0g0v0Filler.json",
-            "sourceHash" : "7fce3e7c2b868fa652c65c1eee190770d9b0847f009cbbe0e22a7a6313717c49"
+            "sourceHash" : "97787f4708462e7e4d98d60d6888d3c6e1184d1178ff5247fe2107e57a23aadc"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x046c8f",
-                    "hash" : "0x7dac76476a24c7e4639f269d1875564680f8422f63ad3b35bf9c63d5fa4b03b3",
-                    "mixHash" : "0x7a32fbfdcdbecd31f1528fd39c818b468c3294bce2be3e8ee1ff66b5926783ff",
-                    "nonce" : "0x7ec8791f82e19a78",
+                    "hash" : "0x7b83f8007abb6ae8a70c94f290e91a2c95f4985f0cbd4b28fc66b80c87eb182f",
+                    "mixHash" : "0x5c5a6edd907510af35124fcf4a7abb432108f02e0b78870cd09de887e0556831",
+                    "nonce" : "0x63fc361b7de8c4d1",
                     "number" : "0x01",
                     "parentHash" : "0x009abe5d6f5ef8bf2c86b5ca81b64a039368687ed7e5d6c24b3293f63716c2f5",
                     "receiptTrie" : "0xfe7f8de3ef6822a48af4e87712534d1451644a8a9744a86752c749a5cbf57f30",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0009abe5d6f5ef8bf2c86b5ca81b64a039368687ed7e5d6c24b3293f63716c2f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29a0b2b82477f793aff01c88114e51bbc2013cde0e4c856cbfa69eec69d12a5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0fe7f8de3ef6822a48af4e87712534d1451644a8a9744a86752c749a5cbf57f30b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083046c8f8203e880a07a32fbfdcdbecd31f1528fd39c818b468c3294bce2be3e8ee1ff66b5926783ff887ec8791f82e19a78f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0009abe5d6f5ef8bf2c86b5ca81b64a039368687ed7e5d6c24b3293f63716c2f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b29a0b2b82477f793aff01c88114e51bbc2013cde0e4c856cbfa69eec69d12a5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0fe7f8de3ef6822a48af4e87712534d1451644a8a9744a86752c749a5cbf57f30b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083046c8f8203e880a05c5a6edd907510af35124fcf4a7abb432108f02e0b78870cd09de887e05568318863fc361b7de8c4d1f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6b4d71b20e3d955ec8a2309b1587729f5296da7ad50813f73d5fbefe609eb96a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7dac76476a24c7e4639f269d1875564680f8422f63ad3b35bf9c63d5fa4b03b3",
+        "lastblockhash" : "0x7b83f8007abb6ae8a70c94f290e91a2c95f4985f0cbd4b28fc66b80c87eb182f",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -161,337 +161,13 @@
             }
         }
     },
-    "callcodecallcallcode_101_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_d0g0v0Filler.json",
-            "sourceHash" : "7fce3e7c2b868fa652c65c1eee190770d9b0847f009cbbe0e22a7a6313717c49"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x046c8f",
-                    "hash" : "0x449119eae4d4ff2d8ca128ad7d6f3b9b461081f946da13cff0439fe8335fa279",
-                    "mixHash" : "0x886650f498d64273ffb8f80731e5c56a6a8ce04ca2d1971bc256f312c5e4165c",
-                    "nonce" : "0xa9430db30991f95d",
-                    "number" : "0x01",
-                    "parentHash" : "0x009abe5d6f5ef8bf2c86b5ca81b64a039368687ed7e5d6c24b3293f63716c2f5",
-                    "receiptTrie" : "0x63d5f0f0407f380a948d3dbb3a817713c8996cc049b75a9ca0027e27e973ec6d",
-                    "stateRoot" : "0x8a956c196a5edf964a29e1be0987d8f886979d10e1c8bc04c162d05249d90f26",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0009abe5d6f5ef8bf2c86b5ca81b64a039368687ed7e5d6c24b3293f63716c2f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a956c196a5edf964a29e1be0987d8f886979d10e1c8bc04c162d05249d90f26a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a063d5f0f0407f380a948d3dbb3a817713c8996cc049b75a9ca0027e27e973ec6db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083046c8f8203e880a0886650f498d64273ffb8f80731e5c56a6a8ce04ca2d1971bc256f312c5e4165c88a9430db30991f95df862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x009abe5d6f5ef8bf2c86b5ca81b64a039368687ed7e5d6c24b3293f63716c2f5",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xa6b4d71b20e3d955ec8a2309b1587729f5296da7ad50813f73d5fbefe609eb96",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6b4d71b20e3d955ec8a2309b1587729f5296da7ad50813f73d5fbefe609eb96a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x449119eae4d4ff2d8ca128ad7d6f3b9b461081f946da13cff0439fe8335fa279",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x014a" : "0x1000000000000000000000000000000000000000",
-                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x0150" : "0x40",
-                    "0x0152" : "0x26",
-                    "0x0154" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01",
-                    "0x04" : "0x1000000000000000000000000000000000000000",
-                    "0x05" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x06" : "0x1000000000000000000000000000000000000000",
-                    "0x07" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006001731000000000000000000000000000000000000002620493e0f260015533600555",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000036203d090f460025533600655",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f86c8f",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75f9371",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006001731000000000000000000000000000000000000002620493e0f260015533600555",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000036203d090f460025533600655",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcallcode_101_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/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_d0g0v0Filler.json",
-            "sourceHash" : "7fce3e7c2b868fa652c65c1eee190770d9b0847f009cbbe0e22a7a6313717c49"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x046c8f",
-                    "hash" : "0xa7622f4a54e264901998368a79874fd0d697b0f5bad63869760846e970ac1e64",
-                    "mixHash" : "0xc56f60200151c2b38f5949097a3ef32cd8d1e635162a8881abc7d4c5e4972f33",
-                    "nonce" : "0xfe10b879de4b9b7d",
-                    "number" : "0x01",
-                    "parentHash" : "0x009abe5d6f5ef8bf2c86b5ca81b64a039368687ed7e5d6c24b3293f63716c2f5",
-                    "receiptTrie" : "0x63d5f0f0407f380a948d3dbb3a817713c8996cc049b75a9ca0027e27e973ec6d",
-                    "stateRoot" : "0x8a956c196a5edf964a29e1be0987d8f886979d10e1c8bc04c162d05249d90f26",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0009abe5d6f5ef8bf2c86b5ca81b64a039368687ed7e5d6c24b3293f63716c2f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08a956c196a5edf964a29e1be0987d8f886979d10e1c8bc04c162d05249d90f26a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a063d5f0f0407f380a948d3dbb3a817713c8996cc049b75a9ca0027e27e973ec6db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083046c8f8203e880a0c56f60200151c2b38f5949097a3ef32cd8d1e635162a8881abc7d4c5e4972f3388fe10b879de4b9b7df862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x009abe5d6f5ef8bf2c86b5ca81b64a039368687ed7e5d6c24b3293f63716c2f5",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xa6b4d71b20e3d955ec8a2309b1587729f5296da7ad50813f73d5fbefe609eb96",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6b4d71b20e3d955ec8a2309b1587729f5296da7ad50813f73d5fbefe609eb96a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa7622f4a54e264901998368a79874fd0d697b0f5bad63869760846e970ac1e64",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x014a" : "0x1000000000000000000000000000000000000000",
-                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x0150" : "0x40",
-                    "0x0152" : "0x26",
-                    "0x0154" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01",
-                    "0x04" : "0x1000000000000000000000000000000000000000",
-                    "0x05" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x06" : "0x1000000000000000000000000000000000000000",
-                    "0x07" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006001731000000000000000000000000000000000000002620493e0f260015533600555",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000036203d090f460025533600655",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f86c8f",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75f9371",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006001731000000000000000000000000000000000000002620493e0f260015533600555",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000036203d090f460025533600655",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcallcode_101_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_d0g0v0Filler.json",
-            "sourceHash" : "7fce3e7c2b868fa652c65c1eee190770d9b0847f009cbbe0e22a7a6313717c49"
+            "sourceHash" : "97787f4708462e7e4d98d60d6888d3c6e1184d1178ff5247fe2107e57a23aadc"
         },
         "blocks" : [
             {
@@ -502,9 +178,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x7e60f878611bcb167310ce374e9a698fd63a2aa90332c4955fc65c226294acb4",
-                    "mixHash" : "0xa915dc912219afc7082bc77d7056239e8a4e594c0196c1d467a11c9759cb4f6e",
-                    "nonce" : "0x43d9cc36b11b889b",
+                    "hash" : "0x3acec3e16deecd246d7d3b5f435b58fc27fbec90ddf8f27838bb054677cb52ba",
+                    "mixHash" : "0xff3b4e47cc8a6e0076d6ebc32227ccd34a7478c82924ae308569751417cbaade",
+                    "nonce" : "0xc6cc3875e323dd23",
                     "number" : "0x01",
                     "parentHash" : "0x009abe5d6f5ef8bf2c86b5ca81b64a039368687ed7e5d6c24b3293f63716c2f5",
                     "receiptTrie" : "0xe1f59d66edaf42bdf71bb23d14d8da7faec552db6fbacbf081a4d8591f311cce",
@@ -513,10 +189,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0009abe5d6f5ef8bf2c86b5ca81b64a039368687ed7e5d6c24b3293f63716c2f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06b3b47a21c68ccc686ec198fc5c95ad4e01db5bb7f973589eda63da2ef6b490ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e1f59d66edaf42bdf71bb23d14d8da7faec552db6fbacbf081a4d8591f311cceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0a915dc912219afc7082bc77d7056239e8a4e594c0196c1d467a11c9759cb4f6e8843d9cc36b11b889bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0009abe5d6f5ef8bf2c86b5ca81b64a039368687ed7e5d6c24b3293f63716c2f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06b3b47a21c68ccc686ec198fc5c95ad4e01db5bb7f973589eda63da2ef6b490ca05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e1f59d66edaf42bdf71bb23d14d8da7faec552db6fbacbf081a4d8591f311cceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0ff3b4e47cc8a6e0076d6ebc32227ccd34a7478c82924ae308569751417cbaade88c6cc3875e323dd23f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -550,7 +226,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6b4d71b20e3d955ec8a2309b1587729f5296da7ad50813f73d5fbefe609eb96a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7e60f878611bcb167310ce374e9a698fd63a2aa90332c4955fc65c226294acb4",
+        "lastblockhash" : "0x3acec3e16deecd246d7d3b5f435b58fc27fbec90ddf8f27838bb054677cb52ba",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -633,167 +309,5 @@
                 }
             }
         }
-    },
-    "callcodecallcallcode_101_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/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_101_d0g0v0Filler.json",
-            "sourceHash" : "7fce3e7c2b868fa652c65c1eee190770d9b0847f009cbbe0e22a7a6313717c49"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0464d3",
-                    "hash" : "0x985820182f1033716d5c9fd41b9a0911cdd53657d0ed31c8e391184b7583ba24",
-                    "mixHash" : "0x6693bd24736ed0af582f74754a44a988a80a4e281fc90c75dc3abae84efb1e39",
-                    "nonce" : "0x61cf1b3ba2d0678c",
-                    "number" : "0x01",
-                    "parentHash" : "0x009abe5d6f5ef8bf2c86b5ca81b64a039368687ed7e5d6c24b3293f63716c2f5",
-                    "receiptTrie" : "0x07f15469868a38e2cca8513311db4c55bfba20f2b6dbdfa86cd54bad2300d563",
-                    "stateRoot" : "0xe53b450d7c250b4a3b62c823c4aced5fb0af71e5a50bf1ff1d80ec576d742d5f",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0009abe5d6f5ef8bf2c86b5ca81b64a039368687ed7e5d6c24b3293f63716c2f5a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e53b450d7c250b4a3b62c823c4aced5fb0af71e5a50bf1ff1d80ec576d742d5fa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a007f15469868a38e2cca8513311db4c55bfba20f2b6dbdfa86cd54bad2300d563b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830464d38203e880a06693bd24736ed0af582f74754a44a988a80a4e281fc90c75dc3abae84efb1e398861cf1b3ba2d0678cf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x009abe5d6f5ef8bf2c86b5ca81b64a039368687ed7e5d6c24b3293f63716c2f5",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xa6b4d71b20e3d955ec8a2309b1587729f5296da7ad50813f73d5fbefe609eb96",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a6b4d71b20e3d955ec8a2309b1587729f5296da7ad50813f73d5fbefe609eb96a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x985820182f1033716d5c9fd41b9a0911cdd53657d0ed31c8e391184b7583ba24",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x014a" : "0x1000000000000000000000000000000000000000",
-                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x0150" : "0x40",
-                    "0x0152" : "0x26",
-                    "0x0154" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01",
-                    "0x04" : "0x1000000000000000000000000000000000000000",
-                    "0x05" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x06" : "0x1000000000000000000000000000000000000000",
-                    "0x07" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006001731000000000000000000000000000000000000002620493e0f260015533600555",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000036203d090f460025533600655",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f864d3",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75f9b2d",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060006001731000000000000000000000000000000000000002620493e0f260015533600555",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000036203d090f460025533600655",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0.json
index 7214dd52a..548ff118f 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcallcode_ABCB_RECURSIVE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "58ac4e2720c6822a5bb8a5cc43e4c9da1ecc0dfd3875ca67f33cb17e495e1c7f"
+            "sourceHash" : "2f6a157e1d2bb573f9c131127c20d5b2c29c7bb0e527da3417e6db8f3ef8939a"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab78",
-                    "hash" : "0xd3f8e535cc23ff64ce928ba47872781ff0b9c2235423adbd31a3531a766ac6c7",
-                    "mixHash" : "0x1b697c2695030f2f727bac5a57e7aa523d8a0042ea4630d04b57b693f0e8b949",
-                    "nonce" : "0x2722f220b8d601fe",
+                    "hash" : "0x0e173563e46ce720277d01dbc919180801e060a84c79e0ca6d5ab5fdee7ed3e8",
+                    "mixHash" : "0x2a8d812990edda7e34fba260d08555d524e4a1d1088897a576060d27d3bf5f42",
+                    "nonce" : "0x95ce6134322296ea",
                     "number" : "0x01",
                     "parentHash" : "0x5904287a3758f5882f31480ec638f6b3a09e792b8b86a5ab539aacc8bcbbb9bc",
                     "receiptTrie" : "0x29a19a0aaaab34a36ad92b7ff6b4e7ff702697c39fe7cf47ee0576931eba0bc9",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a05904287a3758f5882f31480ec638f6b3a09e792b8b86a5ab539aacc8bcbbb9bca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e52de388d900ecaca5348cf98d7dba2d3647c46d653a18cf13c4bdda5dc7c5c7a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a029a19a0aaaab34a36ad92b7ff6b4e7ff702697c39fe7cf47ee0576931eba0bc9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab788203e880a01b697c2695030f2f727bac5a57e7aa523d8a0042ea4630d04b57b693f0e8b949882722f220b8d601fef863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a05904287a3758f5882f31480ec638f6b3a09e792b8b86a5ab539aacc8bcbbb9bca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e52de388d900ecaca5348cf98d7dba2d3647c46d653a18cf13c4bdda5dc7c5c7a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a029a19a0aaaab34a36ad92b7ff6b4e7ff702697c39fe7cf47ee0576931eba0bc9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab788203e880a02a8d812990edda7e34fba260d08555d524e4a1d1088897a576060d27d3bf5f428895ce6134322296eaf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08bc17fdb151a02e517ad7d0425e595cf36088b01b2111d9dfc45e1b92b1de4a3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd3f8e535cc23ff64ce928ba47872781ff0b9c2235423adbd31a3531a766ac6c7",
+        "lastblockhash" : "0x0e173563e46ce720277d01dbc919180801e060a84c79e0ca6d5ab5fdee7ed3e8",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -136,287 +136,13 @@
             }
         }
     },
-    "callcodecallcallcode_ABCB_RECURSIVE_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "58ac4e2720c6822a5bb8a5cc43e4c9da1ecc0dfd3875ca67f33cb17e495e1c7f"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08ab78",
-                    "hash" : "0x6f97fdfbe22bb01d7d3bb024f2df6d1fed60029e5d26d7e4d7a16bb04f9d87e6",
-                    "mixHash" : "0x98349750fc745415a91c32b1d658e92cb57d0aa66402a35e6c323326f7a63412",
-                    "nonce" : "0x2cde66b1daccad8f",
-                    "number" : "0x01",
-                    "parentHash" : "0x5904287a3758f5882f31480ec638f6b3a09e792b8b86a5ab539aacc8bcbbb9bc",
-                    "receiptTrie" : "0xad9bbc450b2a4a740e03522dd2832cc546e1e9d9ee4424eaee5269bc07196969",
-                    "stateRoot" : "0x1fd417279641c7c9e3f00c5a2c9714247f0789420991451836df0064149e5acb",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f9a05904287a3758f5882f31480ec638f6b3a09e792b8b86a5ab539aacc8bcbbb9bca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01fd417279641c7c9e3f00c5a2c9714247f0789420991451836df0064149e5acba06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0ad9bbc450b2a4a740e03522dd2832cc546e1e9d9ee4424eaee5269bc07196969b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab788203e880a098349750fc745415a91c32b1d658e92cb57d0aa66402a35e6c323326f7a63412882cde66b1daccad8ff863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x01c9c380",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
-                        "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0xb2d05e00",
-            "gasUsed" : "0x00",
-            "hash" : "0x5904287a3758f5882f31480ec638f6b3a09e792b8b86a5ab539aacc8bcbbb9bc",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x8bc17fdb151a02e517ad7d0425e595cf36088b01b2111d9dfc45e1b92b1de4a3",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08bc17fdb151a02e517ad7d0425e595cf36088b01b2111d9dfc45e1b92b1de4a3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6f97fdfbe22bb01d7d3bb024f2df6d1fed60029e5d26d7e4d7a16bb04f9d87e6",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000163017d7840f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000016207a120f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fcab78",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5488",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000163017d7840f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000016207a120f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcallcode_ABCB_RECURSIVE_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/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "58ac4e2720c6822a5bb8a5cc43e4c9da1ecc0dfd3875ca67f33cb17e495e1c7f"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08ab78",
-                    "hash" : "0xbe50ce1447a9f34bb074d370b30c89373be30435c9005adee72b21672359b1b7",
-                    "mixHash" : "0xb4e63aaa3546886c9fa6ecceadeef37ab66a7a81e252e3ac163219918efa2934",
-                    "nonce" : "0x5dd219feb9e5d8bd",
-                    "number" : "0x01",
-                    "parentHash" : "0x5904287a3758f5882f31480ec638f6b3a09e792b8b86a5ab539aacc8bcbbb9bc",
-                    "receiptTrie" : "0xad9bbc450b2a4a740e03522dd2832cc546e1e9d9ee4424eaee5269bc07196969",
-                    "stateRoot" : "0x1fd417279641c7c9e3f00c5a2c9714247f0789420991451836df0064149e5acb",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f9a05904287a3758f5882f31480ec638f6b3a09e792b8b86a5ab539aacc8bcbbb9bca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01fd417279641c7c9e3f00c5a2c9714247f0789420991451836df0064149e5acba06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0ad9bbc450b2a4a740e03522dd2832cc546e1e9d9ee4424eaee5269bc07196969b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab788203e880a0b4e63aaa3546886c9fa6ecceadeef37ab66a7a81e252e3ac163219918efa2934885dd219feb9e5d8bdf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x01c9c380",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
-                        "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0xb2d05e00",
-            "gasUsed" : "0x00",
-            "hash" : "0x5904287a3758f5882f31480ec638f6b3a09e792b8b86a5ab539aacc8bcbbb9bc",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x8bc17fdb151a02e517ad7d0425e595cf36088b01b2111d9dfc45e1b92b1de4a3",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08bc17fdb151a02e517ad7d0425e595cf36088b01b2111d9dfc45e1b92b1de4a3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbe50ce1447a9f34bb074d370b30c89373be30435c9005adee72b21672359b1b7",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000163017d7840f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000016207a120f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fcab78",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5488",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000163017d7840f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000002620f4240f2600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000016207a120f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcallcode_ABCB_RECURSIVE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "58ac4e2720c6822a5bb8a5cc43e4c9da1ecc0dfd3875ca67f33cb17e495e1c7f"
+            "sourceHash" : "2f6a157e1d2bb573f9c131127c20d5b2c29c7bb0e527da3417e6db8f3ef8939a"
         },
         "blocks" : [
             {
@@ -427,9 +153,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x01c9c380",
-                    "hash" : "0xb739516baf50d1db8d6c9597bc233bea3903ceb1ef00faea0fcfe8381b178308",
-                    "mixHash" : "0x94ec4a6ca34429306821d3a4fba6612646069a06a83b14f0b4aaf30b2d82bc5a",
-                    "nonce" : "0x7bdac8c8bb256c8a",
+                    "hash" : "0xde74bcc61ed6f1ee74761e9258dc6188db671fa84f188df18264198527431866",
+                    "mixHash" : "0x0dfcc496aee24f40d7249e6a00ab98e357eb0c65f09d3e349d5f0c1e85b09651",
+                    "nonce" : "0x986cdc316a6e8989",
                     "number" : "0x01",
                     "parentHash" : "0x5904287a3758f5882f31480ec638f6b3a09e792b8b86a5ab539aacc8bcbbb9bc",
                     "receiptTrie" : "0xcac9b5e6f1f6798cfead851b3e76599273bdd8923c99b38a6a599d5790acbcf7",
@@ -438,10 +164,10 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa05904287a3758f5882f31480ec638f6b3a09e792b8b86a5ab539aacc8bcbbb9bca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0099c29c660e492ce5e0de055df3f7e0cb5d63112a56b9ab2980931e1f31b0975a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0cac9b5e6f1f6798cfead851b3e76599273bdd8923c99b38a6a599d5790acbcf7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008401c9c3808203e880a094ec4a6ca34429306821d3a4fba6612646069a06a83b14f0b4aaf30b2d82bc5a887bdac8c8bb256c8af863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90263f901faa05904287a3758f5882f31480ec638f6b3a09e792b8b86a5ab539aacc8bcbbb9bca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0099c29c660e492ce5e0de055df3f7e0cb5d63112a56b9ab2980931e1f31b0975a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0cac9b5e6f1f6798cfead851b3e76599273bdd8923c99b38a6a599d5790acbcf7b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008401c9c3808203e880a00dfcc496aee24f40d7249e6a00ab98e357eb0c65f09d3e349d5f0c1e85b0965188986cdc316a6e8989f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -475,7 +201,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08bc17fdb151a02e517ad7d0425e595cf36088b01b2111d9dfc45e1b92b1de4a3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb739516baf50d1db8d6c9597bc233bea3903ceb1ef00faea0fcfe8381b178308",
+        "lastblockhash" : "0xde74bcc61ed6f1ee74761e9258dc6188db671fa84f188df18264198527431866",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -548,10 +274,10 @@
     "callcodecallcallcode_ABCB_RECURSIVE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcallcode_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "58ac4e2720c6822a5bb8a5cc43e4c9da1ecc0dfd3875ca67f33cb17e495e1c7f"
+            "sourceHash" : "2f6a157e1d2bb573f9c131127c20d5b2c29c7bb0e527da3417e6db8f3ef8939a"
         },
         "blocks" : [
             {
@@ -562,9 +288,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3bc",
-                    "hash" : "0x28f4fbe67b07de833877c9d569d59360fe505368c1820dbd20e50642234be222",
-                    "mixHash" : "0xd2c0b05801a84a72e10045a40ccb3ef802286a8e85a65ca8794d8c6faf95b9d8",
-                    "nonce" : "0xd0a99fea31b685da",
+                    "hash" : "0x32eadc48b223c409583ecaab5c124f3236b52c14ffb282c12e5184f312ec0291",
+                    "mixHash" : "0x46cf8d7c9f4be33a3794ec3f9bd136e616563072ad798c4f0a5d7775dccf91e1",
+                    "nonce" : "0xa65320b3823115e9",
                     "number" : "0x01",
                     "parentHash" : "0x5904287a3758f5882f31480ec638f6b3a09e792b8b86a5ab539aacc8bcbbb9bc",
                     "receiptTrie" : "0xe32f0f3eee081a1041c1654f3e67a6155ec0dfaf41858513b832a9ffe5829018",
@@ -573,10 +299,10 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a05904287a3758f5882f31480ec638f6b3a09e792b8b86a5ab539aacc8bcbbb9bca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c3d70bc4fa1b37965dc0a01200298bfd76bf6ce6cf61c4334feb30f513b2f7aa06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0e32f0f3eee081a1041c1654f3e67a6155ec0dfaf41858513b832a9ffe5829018b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3bc8203e880a0d2c0b05801a84a72e10045a40ccb3ef802286a8e85a65ca8794d8c6faf95b9d888d0a99fea31b685daf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a05904287a3758f5882f31480ec638f6b3a09e792b8b86a5ab539aacc8bcbbb9bca01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c3d70bc4fa1b37965dc0a01200298bfd76bf6ce6cf61c4334feb30f513b2f7aa06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0e32f0f3eee081a1041c1654f3e67a6155ec0dfaf41858513b832a9ffe5829018b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3bc8203e880a046cf8d7c9f4be33a3794ec3f9bd136e616563072ad798c4f0a5d7775dccf91e188a65320b3823115e9f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -610,7 +336,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08bc17fdb151a02e517ad7d0425e595cf36088b01b2111d9dfc45e1b92b1de4a3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x28f4fbe67b07de833877c9d569d59360fe505368c1820dbd20e50642234be222",
+        "lastblockhash" : "0x32eadc48b223c409583ecaab5c124f3236b52c14ffb282c12e5184f312ec0291",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGE_d0g0v0.json
index 807424d0a..5cd6a8224 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGE_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcode_11_OOGE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "3dba179df3de3c381b4aa736fc0bc146f6ca1b9d2e3e8820adb5be21afd52cda"
+            "sourceHash" : "832a548d0118b800c4e131a7d45135802d39d9cf93897e63b7635768eb152661"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x010792",
-                    "hash" : "0x492b70046c8214a4ff58cd568b6d00bf78e128b967ff8d35482abdbef0c578b0",
-                    "mixHash" : "0x46848fb3f1f54f072254dbc294ae81dd424027b87e04a48c5e545d81357ebe85",
-                    "nonce" : "0x38ceb93a7ef2d112",
+                    "hash" : "0x07d7d1f6c277a7acd43317bd175c9549e321cc29361827916d650396d422fe4a",
+                    "mixHash" : "0xb3f517c2297315ec56d096a6c160a8a7183559f5a9368a2d5d5fe609941aa6a5",
+                    "nonce" : "0xa5c89d8866c3f1d0",
                     "number" : "0x01",
                     "parentHash" : "0xd2ce292663fe5f1f42048c4caa702a37e58e2884b8f5d319c9f1fb6a4462b0ce",
                     "receiptTrie" : "0xc413335195bfbc20247b59fa4b434d16fe5d6f457c255e33424abab337074d81",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0d2ce292663fe5f1f42048c4caa702a37e58e2884b8f5d319c9f1fb6a4462b0cea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbbdf0f935533c76ce5191c51af49e464148c7fd11be517bb385760cfaaab3b2a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c413335195bfbc20247b59fa4b434d16fe5d6f457c255e33424abab337074d81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107928203e880a046848fb3f1f54f072254dbc294ae81dd424027b87e04a48c5e545d81357ebe858838ceb93a7ef2d112f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0d2ce292663fe5f1f42048c4caa702a37e58e2884b8f5d319c9f1fb6a4462b0cea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbbdf0f935533c76ce5191c51af49e464148c7fd11be517bb385760cfaaab3b2a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c413335195bfbc20247b59fa4b434d16fe5d6f457c255e33424abab337074d81b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107928203e880a0b3f517c2297315ec56d096a6c160a8a7183559f5a9368a2d5d5fe609941aa6a588a5c89d8866c3f1d0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0865e51f149554e1d907c9f5458037618a3ef85e175e361445379a0de9e501f30a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x492b70046c8214a4ff58cd568b6d00bf78e128b967ff8d35482abdbef0c578b0",
+        "lastblockhash" : "0x07d7d1f6c277a7acd43317bd175c9549e321cc29361827916d650396d422fe4a",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -135,285 +135,13 @@
             }
         }
     },
-    "callcodecallcode_11_OOGE_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "3dba179df3de3c381b4aa736fc0bc146f6ca1b9d2e3e8820adb5be21afd52cda"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x010792",
-                    "hash" : "0xc02f265e6e8361c7355a360f02948ebeb53c926ba57c4b3a53aba16bb4c1f7c0",
-                    "mixHash" : "0xf28bd18b7f7b0d31ab506764ae1f2319328452e5a37a5e6c2e0856da5fb8f8ea",
-                    "nonce" : "0x7663302a9c10218d",
-                    "number" : "0x01",
-                    "parentHash" : "0xd2ce292663fe5f1f42048c4caa702a37e58e2884b8f5d319c9f1fb6a4462b0ce",
-                    "receiptTrie" : "0x9e6b850c81c3cd9986e49e57d5ec92a0b4dcc6c3b7b2f7daefd5159dd7f08ccb",
-                    "stateRoot" : "0x4f2958edc417929e08ce77a2a8dd07e5944f6d7833b19d1599e9908a67b56c6f",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0d2ce292663fe5f1f42048c4caa702a37e58e2884b8f5d319c9f1fb6a4462b0cea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f2958edc417929e08ce77a2a8dd07e5944f6d7833b19d1599e9908a67b56c6fa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09e6b850c81c3cd9986e49e57d5ec92a0b4dcc6c3b7b2f7daefd5159dd7f08ccbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107928203e880a0f28bd18b7f7b0d31ab506764ae1f2319328452e5a37a5e6c2e0856da5fb8f8ea887663302a9c10218df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xd2ce292663fe5f1f42048c4caa702a37e58e2884b8f5d319c9f1fb6a4462b0ce",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x865e51f149554e1d907c9f5458037618a3ef85e175e361445379a0de9e501f30",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0865e51f149554e1d907c9f5458037618a3ef85e175e361445379a0de9e501f30a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc02f265e6e8361c7355a360f02948ebeb53c926ba57c4b3a53aba16bb4c1f7c0",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002614e34f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50792",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762f86e",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002614e34f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcode_11_OOGE_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/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "3dba179df3de3c381b4aa736fc0bc146f6ca1b9d2e3e8820adb5be21afd52cda"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x010792",
-                    "hash" : "0x628b538b657d8f84d2c19710a2201aa4db0977d0d419fa94588d042f2192d4c0",
-                    "mixHash" : "0xf0fda2634bb96f0f908a552d5899e5d5d3571574ee43ea8c45ee1ad0cb989591",
-                    "nonce" : "0xcb88762a53cfa51b",
-                    "number" : "0x01",
-                    "parentHash" : "0xd2ce292663fe5f1f42048c4caa702a37e58e2884b8f5d319c9f1fb6a4462b0ce",
-                    "receiptTrie" : "0x9e6b850c81c3cd9986e49e57d5ec92a0b4dcc6c3b7b2f7daefd5159dd7f08ccb",
-                    "stateRoot" : "0x4f2958edc417929e08ce77a2a8dd07e5944f6d7833b19d1599e9908a67b56c6f",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0d2ce292663fe5f1f42048c4caa702a37e58e2884b8f5d319c9f1fb6a4462b0cea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f2958edc417929e08ce77a2a8dd07e5944f6d7833b19d1599e9908a67b56c6fa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09e6b850c81c3cd9986e49e57d5ec92a0b4dcc6c3b7b2f7daefd5159dd7f08ccbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830107928203e880a0f0fda2634bb96f0f908a552d5899e5d5d3571574ee43ea8c45ee1ad0cb98959188cb88762a53cfa51bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xd2ce292663fe5f1f42048c4caa702a37e58e2884b8f5d319c9f1fb6a4462b0ce",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x865e51f149554e1d907c9f5458037618a3ef85e175e361445379a0de9e501f30",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0865e51f149554e1d907c9f5458037618a3ef85e175e361445379a0de9e501f30a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x628b538b657d8f84d2c19710a2201aa4db0977d0d419fa94588d042f2192d4c0",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002614e34f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f50792",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762f86e",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002614e34f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcode_11_OOGE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "3dba179df3de3c381b4aa736fc0bc146f6ca1b9d2e3e8820adb5be21afd52cda"
+            "sourceHash" : "832a548d0118b800c4e131a7d45135802d39d9cf93897e63b7635768eb152661"
         },
         "blocks" : [
             {
@@ -424,9 +152,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "0x95588378dfbc12f1540a83131738b7ec7c8b69bb5c4c3612bf827222ccf42042",
-                    "mixHash" : "0x1723a4ed2f401bd6585339a12abedb365d18835f3e70981ee129ea725d0484bd",
-                    "nonce" : "0x134041eff7e0faf6",
+                    "hash" : "0xb84cd86ca1e9be68dac6620b5185421e04b63accb34f4e07f3d67afd80a1f253",
+                    "mixHash" : "0x889316fc8a2f9004c7a1b2dcedc173d680e7d51d712c9f00e292ebe83495e1f2",
+                    "nonce" : "0x80ccbf5787b7cd6d",
                     "number" : "0x01",
                     "parentHash" : "0xd2ce292663fe5f1f42048c4caa702a37e58e2884b8f5d319c9f1fb6a4462b0ce",
                     "receiptTrie" : "0xc7796b8aef927f582defb5b34589ef9a41570d5619502e70d6125ada54c5c11d",
@@ -435,10 +163,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0d2ce292663fe5f1f42048c4caa702a37e58e2884b8f5d319c9f1fb6a4462b0cea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001ad2a003048ffc8881164be24c02701e11868059fb118b03a77e1d691924046a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c7796b8aef927f582defb5b34589ef9a41570d5619502e70d6125ada54c5c11db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a01723a4ed2f401bd6585339a12abedb365d18835f3e70981ee129ea725d0484bd88134041eff7e0faf6f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0d2ce292663fe5f1f42048c4caa702a37e58e2884b8f5d319c9f1fb6a4462b0cea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001ad2a003048ffc8881164be24c02701e11868059fb118b03a77e1d691924046a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0c7796b8aef927f582defb5b34589ef9a41570d5619502e70d6125ada54c5c11db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0889316fc8a2f9004c7a1b2dcedc173d680e7d51d712c9f00e292ebe83495e1f28880ccbf5787b7cd6df862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -472,7 +200,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0865e51f149554e1d907c9f5458037618a3ef85e175e361445379a0de9e501f30a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x95588378dfbc12f1540a83131738b7ec7c8b69bb5c4c3612bf827222ccf42042",
+        "lastblockhash" : "0xb84cd86ca1e9be68dac6620b5185421e04b63accb34f4e07f3d67afd80a1f253",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -541,141 +269,5 @@
                 }
             }
         }
-    },
-    "callcodecallcode_11_OOGE_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/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "3dba179df3de3c381b4aa736fc0bc146f6ca1b9d2e3e8820adb5be21afd52cda"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x01026a",
-                    "hash" : "0x0eea204fdaa99211fdd8b13702ce8927df6a8cc7276f061e8bd617c553e3a959",
-                    "mixHash" : "0x732c0f8481d438b31f22ea2cfaac55d2e2e113c24e84f37eec57f1fe999ff30f",
-                    "nonce" : "0x54e4499b4a12e749",
-                    "number" : "0x01",
-                    "parentHash" : "0xd2ce292663fe5f1f42048c4caa702a37e58e2884b8f5d319c9f1fb6a4462b0ce",
-                    "receiptTrie" : "0x95eaefa198f6b22f0e692050827864f456eece474f97ed2adb556028e8f3d6a9",
-                    "stateRoot" : "0x1af5a03cfffdaa4050f1a746ef2b239b6f53a65d9c5d0c368787b974ebd8b47e",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0d2ce292663fe5f1f42048c4caa702a37e58e2884b8f5d319c9f1fb6a4462b0cea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01af5a03cfffdaa4050f1a746ef2b239b6f53a65d9c5d0c368787b974ebd8b47ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea095eaefa198f6b22f0e692050827864f456eece474f97ed2adb556028e8f3d6a9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301026a8203e880a0732c0f8481d438b31f22ea2cfaac55d2e2e113c24e84f37eec57f1fe999ff30f8854e4499b4a12e749f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xd2ce292663fe5f1f42048c4caa702a37e58e2884b8f5d319c9f1fb6a4462b0ce",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x865e51f149554e1d907c9f5458037618a3ef85e175e361445379a0de9e501f30",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0865e51f149554e1d907c9f5458037618a3ef85e175e361445379a0de9e501f30a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0eea204fdaa99211fdd8b13702ce8927df6a8cc7276f061e8bd617c553e3a959",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002614e34f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5026a",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762fd96",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002614e34f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016002556001600252",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEnd_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEnd_d0g0v0.json
index b898d8d17..82c8ef5fe 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEnd_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEnd_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcode_11_SuicideEnd_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "1705668ae4c4c3c78cc7eaf1060b4590d4f7eb80584ad17cb5ca2028df2a14c3"
+            "sourceHash" : "3ded5290292a68f61a6fc331a3fef4004c5989e9843e30918e28b513dd272ba8"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf7e7",
-                    "hash" : "0x274a823f15c134dbe5d4e18b7465a48469a63a6736ce455b6baccc43b99d1fe9",
-                    "mixHash" : "0x13ec187ea1af07cbca5210912549f9319407bb06f665f1a9d35234f8b81adb79",
-                    "nonce" : "0xa4748f7630d3135d",
+                    "hash" : "0xdbde8bc169d39579963e96ab479d56c9ee9db8c54682c8b43dafb44f03422641",
+                    "mixHash" : "0x2118bb37d5de1dd6cf4a548d1b45b0286a7b5c5b2151e89ff3e4ac249665fe1c",
+                    "nonce" : "0x2a1f8e908f644ab5",
                     "number" : "0x01",
                     "parentHash" : "0x9d56c6dbeafede7ec6a02ea9f5c46fc395302022c86b3101ab993ddc8383f954",
                     "receiptTrie" : "0x5a080e1d347e3dbe0f485f75747110b80aaff4db4230b7ec59302d17f3264114",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a09d56c6dbeafede7ec6a02ea9f5c46fc395302022c86b3101ab993ddc8383f954a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c940f373ab30c4e37fb7595009055bdfadb925f5aeb5f1a24ff0482b96f22db1a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05a080e1d347e3dbe0f485f75747110b80aaff4db4230b7ec59302d17f3264114b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7e78203e880a013ec187ea1af07cbca5210912549f9319407bb06f665f1a9d35234f8b81adb7988a4748f7630d3135df862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a09d56c6dbeafede7ec6a02ea9f5c46fc395302022c86b3101ab993ddc8383f954a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c940f373ab30c4e37fb7595009055bdfadb925f5aeb5f1a24ff0482b96f22db1a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05a080e1d347e3dbe0f485f75747110b80aaff4db4230b7ec59302d17f3264114b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7e78203e880a02118bb37d5de1dd6cf4a548d1b45b0286a7b5c5b2151e89ff3e4ac249665fe1c882a1f8e908f644ab5f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7055e7283ec5ae0d23d9cc32b094285c842e8ca1f6535b3e20d28a42deb4993a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x274a823f15c134dbe5d4e18b7465a48469a63a6736ce455b6baccc43b99d1fe9",
+        "lastblockhash" : "0xdbde8bc169d39579963e96ab479d56c9ee9db8c54682c8b43dafb44f03422641",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -127,269 +127,13 @@
             }
         }
     },
-    "callcodecallcode_11_SuicideEnd_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "1705668ae4c4c3c78cc7eaf1060b4590d4f7eb80584ad17cb5ca2028df2a14c3"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf7e7",
-                    "hash" : "0xcf6714c54930dd2d08e38e921565047d016bd9b8ae6656366303667b88d10bdb",
-                    "mixHash" : "0x7495e78ff02165ca292ba7561d2d43301b98be98eb978d63974bc17dff913be2",
-                    "nonce" : "0xb03945f2d0c7efb7",
-                    "number" : "0x01",
-                    "parentHash" : "0x9d56c6dbeafede7ec6a02ea9f5c46fc395302022c86b3101ab993ddc8383f954",
-                    "receiptTrie" : "0xace53bcb820d6515eb3c3acf1f89a6da71838b20ff3674aadad5112deb77782d",
-                    "stateRoot" : "0x16695b43e09f654db9485777043ac6cadff11eda4c8aa1b1fa0cc1dbde8dfb33",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a09d56c6dbeafede7ec6a02ea9f5c46fc395302022c86b3101ab993ddc8383f954a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016695b43e09f654db9485777043ac6cadff11eda4c8aa1b1fa0cc1dbde8dfb33a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0ace53bcb820d6515eb3c3acf1f89a6da71838b20ff3674aadad5112deb77782db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7e78203e880a07495e78ff02165ca292ba7561d2d43301b98be98eb978d63974bc17dff913be288b03945f2d0c7efb7f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x9d56c6dbeafede7ec6a02ea9f5c46fc395302022c86b3101ab993ddc8383f954",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe7055e7283ec5ae0d23d9cc32b094285c842e8ca1f6535b3e20d28a42deb4993",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7055e7283ec5ae0d23d9cc32b094285c842e8ca1f6535b3e20d28a42deb4993a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcf6714c54930dd2d08e38e921565047d016bd9b8ae6656366303667b88d10bdb",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000261c350f4600155731000000000000000000000000000000000000000ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f7e7",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7630819",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000261c350f4600155731000000000000000000000000000000000000000ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcode_11_SuicideEnd_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/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "1705668ae4c4c3c78cc7eaf1060b4590d4f7eb80584ad17cb5ca2028df2a14c3"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf7e7",
-                    "hash" : "0x4a75b64d8e8f60b7a1e1c3b439878f6785ffeeab413e683db31e59ece348f992",
-                    "mixHash" : "0xb01a728de3a44dd86830d18a35f6c26bb79bb1e54b81bb9662037436e790b3e3",
-                    "nonce" : "0x896861bb84a7cae0",
-                    "number" : "0x01",
-                    "parentHash" : "0x9d56c6dbeafede7ec6a02ea9f5c46fc395302022c86b3101ab993ddc8383f954",
-                    "receiptTrie" : "0xace53bcb820d6515eb3c3acf1f89a6da71838b20ff3674aadad5112deb77782d",
-                    "stateRoot" : "0x16695b43e09f654db9485777043ac6cadff11eda4c8aa1b1fa0cc1dbde8dfb33",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a09d56c6dbeafede7ec6a02ea9f5c46fc395302022c86b3101ab993ddc8383f954a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016695b43e09f654db9485777043ac6cadff11eda4c8aa1b1fa0cc1dbde8dfb33a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0ace53bcb820d6515eb3c3acf1f89a6da71838b20ff3674aadad5112deb77782db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f7e78203e880a0b01a728de3a44dd86830d18a35f6c26bb79bb1e54b81bb9662037436e790b3e388896861bb84a7cae0f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x9d56c6dbeafede7ec6a02ea9f5c46fc395302022c86b3101ab993ddc8383f954",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe7055e7283ec5ae0d23d9cc32b094285c842e8ca1f6535b3e20d28a42deb4993",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7055e7283ec5ae0d23d9cc32b094285c842e8ca1f6535b3e20d28a42deb4993a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4a75b64d8e8f60b7a1e1c3b439878f6785ffeeab413e683db31e59ece348f992",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000261c350f4600155731000000000000000000000000000000000000000ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f7e7",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7630819",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000261c350f4600155731000000000000000000000000000000000000000ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcode_11_SuicideEnd_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "1705668ae4c4c3c78cc7eaf1060b4590d4f7eb80584ad17cb5ca2028df2a14c3"
+            "sourceHash" : "3ded5290292a68f61a6fc331a3fef4004c5989e9843e30918e28b513dd272ba8"
         },
         "blocks" : [
             {
@@ -400,9 +144,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0xd2d3b3e3bb22001423d6c428832bce7204ff7078142031c57cdd757331a73e4c",
-                    "mixHash" : "0xf2489c23ccb0b84f765f27cf8875a44eba55146b1d3e9f9b36dcf27d20f05001",
-                    "nonce" : "0x4348a52be421703e",
+                    "hash" : "0xd13673589dc3ce1dc398f83cd65670fa1e53410e2d35e442aa6e5d2ea4f41090",
+                    "mixHash" : "0xdc6d396d80c5d7f75441d14b8d0e5258e68db979c792c781ca84a2d371766d6b",
+                    "nonce" : "0x7c588df4595757d4",
                     "number" : "0x01",
                     "parentHash" : "0x9d56c6dbeafede7ec6a02ea9f5c46fc395302022c86b3101ab993ddc8383f954",
                     "receiptTrie" : "0x30cebee2cf7c5acd4caa9fcce86721b7e588c77ed85da796c1c3376cba6702bd",
@@ -411,10 +155,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a09d56c6dbeafede7ec6a02ea9f5c46fc395302022c86b3101ab993ddc8383f954a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fc384551cd2041a01fc82eb17ee213abc80987c7c86cf9e5cbc2ff417311cde5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a030cebee2cf7c5acd4caa9fcce86721b7e588c77ed85da796c1c3376cba6702bdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0f2489c23ccb0b84f765f27cf8875a44eba55146b1d3e9f9b36dcf27d20f05001884348a52be421703ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a09d56c6dbeafede7ec6a02ea9f5c46fc395302022c86b3101ab993ddc8383f954a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fc384551cd2041a01fc82eb17ee213abc80987c7c86cf9e5cbc2ff417311cde5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a030cebee2cf7c5acd4caa9fcce86721b7e588c77ed85da796c1c3376cba6702bdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0dc6d396d80c5d7f75441d14b8d0e5258e68db979c792c781ca84a2d371766d6b887c588df4595757d4f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -448,7 +192,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7055e7283ec5ae0d23d9cc32b094285c842e8ca1f6535b3e20d28a42deb4993a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd2d3b3e3bb22001423d6c428832bce7204ff7078142031c57cdd757331a73e4c",
+        "lastblockhash" : "0xd13673589dc3ce1dc398f83cd65670fa1e53410e2d35e442aa6e5d2ea4f41090",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -517,133 +261,5 @@
                 }
             }
         }
-    },
-    "callcodecallcode_11_SuicideEnd_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/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "1705668ae4c4c3c78cc7eaf1060b4590d4f7eb80584ad17cb5ca2028df2a14c3"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xdf37",
-                    "hash" : "0x56177cca57e1b4df52f1cd95be8c93076f68b2d248bff339bad81220965563cb",
-                    "mixHash" : "0x727dbb009bd96ff775494bb7d1c903d9212c067ed046a4476d998233d26b425c",
-                    "nonce" : "0x29e7289a08b4237e",
-                    "number" : "0x01",
-                    "parentHash" : "0x9d56c6dbeafede7ec6a02ea9f5c46fc395302022c86b3101ab993ddc8383f954",
-                    "receiptTrie" : "0xd2c4fdf7a24ecdede418f87527f9dc70b971662c57487760cd8c6d4ece0708f3",
-                    "stateRoot" : "0x7e0e0a753279eeb07bc8da07538b838c22e39b52b5d85c1dfffcd93a8dd5f33e",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a09d56c6dbeafede7ec6a02ea9f5c46fc395302022c86b3101ab993ddc8383f954a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07e0e0a753279eeb07bc8da07538b838c22e39b52b5d85c1dfffcd93a8dd5f33ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d2c4fdf7a24ecdede418f87527f9dc70b971662c57487760cd8c6d4ece0708f3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082df378203e880a0727dbb009bd96ff775494bb7d1c903d9212c067ed046a4476d998233d26b425c8829e7289a08b4237ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x9d56c6dbeafede7ec6a02ea9f5c46fc395302022c86b3101ab993ddc8383f954",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe7055e7283ec5ae0d23d9cc32b094285c842e8ca1f6535b3e20d28a42deb4993",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7055e7283ec5ae0d23d9cc32b094285c842e8ca1f6535b3e20d28a42deb4993a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x56177cca57e1b4df52f1cd95be8c93076f68b2d248bff339bad81220965563cb",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000261c350f4600155731000000000000000000000000000000000000000ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4df37",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76320c9",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000261c350f4600155731000000000000000000000000000000000000000ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_d0g0v0.json
index fc8d216d7..5d3ad15a3 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcode_11_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_d0g0v0Filler.json",
-            "sourceHash" : "b6ef20aef56526f33406f527ac08610483d2d3d904eac999d9862e92f8149569"
+            "sourceHash" : "2f2ad4292103f6974ef6dcc027d272ef0b9dcc3c883eca48a72ec18dbddebd4f"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x032a87",
-                    "hash" : "0x8f673cb2dca4fec68dd3df3ff3a9f0c93676b4e716092fb57bbcaa055286da80",
-                    "mixHash" : "0xb457e4b1c2c799f8b9169474e652a71a98ed1bf0e83d9badaca3f03f64110bea",
-                    "nonce" : "0x349d5f7ae0b49074",
+                    "hash" : "0x2d6e145b56f4d5d03271f5613831d948c53065611ced003326674f1f502a6536",
+                    "mixHash" : "0xe417db8aeaf217612010daf203292acfaa9376c361f92660c5959062b083ecaa",
+                    "nonce" : "0x70e6e9b2bae82016",
                     "number" : "0x01",
                     "parentHash" : "0xd5785d03d5a65bda8a9376d25d6459bf4ddc328eefbda29db5a9d34e8c189655",
                     "receiptTrie" : "0xd700a1afc77bdae29470ad7d74db1e2008a94750108e1b8e870994fa763aa699",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0d5785d03d5a65bda8a9376d25d6459bf4ddc328eefbda29db5a9d34e8c189655a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc2967739fe7146e0b01d3a99686061a7bf01575a20a02153972da96f9e39e03a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d700a1afc77bdae29470ad7d74db1e2008a94750108e1b8e870994fa763aa699b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083032a878203e880a0b457e4b1c2c799f8b9169474e652a71a98ed1bf0e83d9badaca3f03f64110bea88349d5f7ae0b49074f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0d5785d03d5a65bda8a9376d25d6459bf4ddc328eefbda29db5a9d34e8c189655a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cc2967739fe7146e0b01d3a99686061a7bf01575a20a02153972da96f9e39e03a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d700a1afc77bdae29470ad7d74db1e2008a94750108e1b8e870994fa763aa699b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083032a878203e880a0e417db8aeaf217612010daf203292acfaa9376c361f92660c5959062b083ecaa8870e6e9b2bae82016f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6350c26ebc63df92e03d115506cc403453666fb98647f72253f297cfe8ea495a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8f673cb2dca4fec68dd3df3ff3a9f0c93676b4e716092fb57bbcaa055286da80",
+        "lastblockhash" : "0x2d6e145b56f4d5d03271f5613831d948c53065611ced003326674f1f502a6536",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -143,301 +143,13 @@
             }
         }
     },
-    "callcodecallcode_11_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_d0g0v0Filler.json",
-            "sourceHash" : "b6ef20aef56526f33406f527ac08610483d2d3d904eac999d9862e92f8149569"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x032a87",
-                    "hash" : "0x14e8b68dc7409f972767ecc66afa512ec42645e6ae7e1770b29b7bcae6ea8ac4",
-                    "mixHash" : "0x0297d8fa87b67d6bc5058ddcadfe8027e9e737c2dd5b8cae5c04fd58a717b2d9",
-                    "nonce" : "0xe0c2bb5af84409a6",
-                    "number" : "0x01",
-                    "parentHash" : "0xd5785d03d5a65bda8a9376d25d6459bf4ddc328eefbda29db5a9d34e8c189655",
-                    "receiptTrie" : "0xe3e505e681334abcbf8d688497c59eb0d6aea64138ebaa24dae05706a8e91725",
-                    "stateRoot" : "0xb0c24bf1edf89d118a5c480988f10243f5db13c0c5a7d9f7e52cf7b046b1628a",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0d5785d03d5a65bda8a9376d25d6459bf4ddc328eefbda29db5a9d34e8c189655a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0c24bf1edf89d118a5c480988f10243f5db13c0c5a7d9f7e52cf7b046b1628aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e3e505e681334abcbf8d688497c59eb0d6aea64138ebaa24dae05706a8e91725b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083032a878203e880a00297d8fa87b67d6bc5058ddcadfe8027e9e737c2dd5b8cae5c04fd58a717b2d988e0c2bb5af84409a6f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xd5785d03d5a65bda8a9376d25d6459bf4ddc328eefbda29db5a9d34e8c189655",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb6350c26ebc63df92e03d115506cc403453666fb98647f72253f297cfe8ea495",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6350c26ebc63df92e03d115506cc403453666fb98647f72253f297cfe8ea495a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x14e8b68dc7409f972767ecc66afa512ec42645e6ae7e1770b29b7bcae6ea8ac4",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x02" : "0x01",
-                    "0x04" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0xe6" : "0x1000000000000000000000000000000000000000",
-                    "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0xec" : "0x40",
-                    "0xee" : "0x21",
-                    "0xf0" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000026203d090f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160025533600455346005553060e6553260e8553660ec553860ee553a60f055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f72a87",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a760d579",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000026203d090f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160025533600455346005553060e6553260e8553660ec553860ee553a60f055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcode_11_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/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_d0g0v0Filler.json",
-            "sourceHash" : "b6ef20aef56526f33406f527ac08610483d2d3d904eac999d9862e92f8149569"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x032a87",
-                    "hash" : "0x82370788cb8df00f64265a344f5b6b5c4535d511b0bfed74c557c82c70be4535",
-                    "mixHash" : "0xce82b79c24e1de12c6f13f227d612bde3b25b3c4111f2d242348ee02c88402db",
-                    "nonce" : "0x1160827205d55d75",
-                    "number" : "0x01",
-                    "parentHash" : "0xd5785d03d5a65bda8a9376d25d6459bf4ddc328eefbda29db5a9d34e8c189655",
-                    "receiptTrie" : "0xe3e505e681334abcbf8d688497c59eb0d6aea64138ebaa24dae05706a8e91725",
-                    "stateRoot" : "0xb0c24bf1edf89d118a5c480988f10243f5db13c0c5a7d9f7e52cf7b046b1628a",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0d5785d03d5a65bda8a9376d25d6459bf4ddc328eefbda29db5a9d34e8c189655a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0c24bf1edf89d118a5c480988f10243f5db13c0c5a7d9f7e52cf7b046b1628aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e3e505e681334abcbf8d688497c59eb0d6aea64138ebaa24dae05706a8e91725b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083032a878203e880a0ce82b79c24e1de12c6f13f227d612bde3b25b3c4111f2d242348ee02c88402db881160827205d55d75f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xd5785d03d5a65bda8a9376d25d6459bf4ddc328eefbda29db5a9d34e8c189655",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb6350c26ebc63df92e03d115506cc403453666fb98647f72253f297cfe8ea495",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6350c26ebc63df92e03d115506cc403453666fb98647f72253f297cfe8ea495a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x82370788cb8df00f64265a344f5b6b5c4535d511b0bfed74c557c82c70be4535",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x02" : "0x01",
-                    "0x04" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0xe6" : "0x1000000000000000000000000000000000000000",
-                    "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0xec" : "0x40",
-                    "0xee" : "0x21",
-                    "0xf0" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000026203d090f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160025533600455346005553060e6553260e8553660ec553860ee553a60f055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f72a87",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a760d579",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000026203d090f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160025533600455346005553060e6553260e8553660ec553860ee553a60f055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcode_11_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_d0g0v0Filler.json",
-            "sourceHash" : "b6ef20aef56526f33406f527ac08610483d2d3d904eac999d9862e92f8149569"
+            "sourceHash" : "2f2ad4292103f6974ef6dcc027d272ef0b9dcc3c883eca48a72ec18dbddebd4f"
         },
         "blocks" : [
             {
@@ -448,9 +160,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0xba5310b791e0f2c8a1d0809c3c0b962a89de724aa6335d7d9e272c7d26c1cf11",
-                    "mixHash" : "0x5159d986ea8d90034ad7c02fafd8a42d2ee5250553689751a037daf929c078b0",
-                    "nonce" : "0x198402ae79f3da9c",
+                    "hash" : "0xe8b256fcae9a12f540b65419f6f234d3a786087e0c4cd9c68cac37b5561ec459",
+                    "mixHash" : "0x59b910732cc029c0a95bc57d672c91b2ad1a500188b3b62691f926ebcf73ab76",
+                    "nonce" : "0x6d0ec3ff8319fb17",
                     "number" : "0x01",
                     "parentHash" : "0xd5785d03d5a65bda8a9376d25d6459bf4ddc328eefbda29db5a9d34e8c189655",
                     "receiptTrie" : "0x99388f6d9fc1dae296ac30d9eeed86339b970b1c214459a61ff8ffd0f97308c1",
@@ -459,10 +171,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0d5785d03d5a65bda8a9376d25d6459bf4ddc328eefbda29db5a9d34e8c189655a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0d40f4de355062df6ae31c7c83f084103b8db267441b9fbeab8a2eb3e4f240aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a099388f6d9fc1dae296ac30d9eeed86339b970b1c214459a61ff8ffd0f97308c1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a05159d986ea8d90034ad7c02fafd8a42d2ee5250553689751a037daf929c078b088198402ae79f3da9cf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0d5785d03d5a65bda8a9376d25d6459bf4ddc328eefbda29db5a9d34e8c189655a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a0d40f4de355062df6ae31c7c83f084103b8db267441b9fbeab8a2eb3e4f240aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a099388f6d9fc1dae296ac30d9eeed86339b970b1c214459a61ff8ffd0f97308c1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a059b910732cc029c0a95bc57d672c91b2ad1a500188b3b62691f926ebcf73ab76886d0ec3ff8319fb17f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -496,7 +208,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6350c26ebc63df92e03d115506cc403453666fb98647f72253f297cfe8ea495a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xba5310b791e0f2c8a1d0809c3c0b962a89de724aa6335d7d9e272c7d26c1cf11",
+        "lastblockhash" : "0xe8b256fcae9a12f540b65419f6f234d3a786087e0c4cd9c68cac37b5561ec459",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -565,149 +277,5 @@
                 }
             }
         }
-    },
-    "callcodecallcode_11_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/stCallDelegateCodesCallCodeHomestead/callcodecallcode_11_d0g0v0Filler.json",
-            "sourceHash" : "b6ef20aef56526f33406f527ac08610483d2d3d904eac999d9862e92f8149569"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x03255f",
-                    "hash" : "0xf7641e2332326ce3dfc8610da08d8ef59acf1b247b3d2e70ad5b02e9a3ef9ee6",
-                    "mixHash" : "0x4820837e43a3b47013f38839989533ef00b2654fe3b360202e47fbb37857d1b0",
-                    "nonce" : "0x89b9adc28320a90a",
-                    "number" : "0x01",
-                    "parentHash" : "0xd5785d03d5a65bda8a9376d25d6459bf4ddc328eefbda29db5a9d34e8c189655",
-                    "receiptTrie" : "0x388f24c2b434520651f209eb6b289ebbff603fc88d13da34c932e73083cdac6a",
-                    "stateRoot" : "0x473175d4893d10ae9d81e3fde0666ffb74efe905b87e9b3211caa8d57e50c6ee",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0d5785d03d5a65bda8a9376d25d6459bf4ddc328eefbda29db5a9d34e8c189655a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0473175d4893d10ae9d81e3fde0666ffb74efe905b87e9b3211caa8d57e50c6eea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0388f24c2b434520651f209eb6b289ebbff603fc88d13da34c932e73083cdac6ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808303255f8203e880a04820837e43a3b47013f38839989533ef00b2654fe3b360202e47fbb37857d1b08889b9adc28320a90af862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xd5785d03d5a65bda8a9376d25d6459bf4ddc328eefbda29db5a9d34e8c189655",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb6350c26ebc63df92e03d115506cc403453666fb98647f72253f297cfe8ea495",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b6350c26ebc63df92e03d115506cc403453666fb98647f72253f297cfe8ea495a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf7641e2332326ce3dfc8610da08d8ef59acf1b247b3d2e70ad5b02e9a3ef9ee6",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x02" : "0x01",
-                    "0x04" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0xe6" : "0x1000000000000000000000000000000000000000",
-                    "0xe8" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0xec" : "0x40",
-                    "0xee" : "0x21",
-                    "0xf0" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000026203d090f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160025533600455346005553060e6553260e8553660ec553860ee553a60f055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f7255f",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a760daa1",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000026203d090f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160025533600455346005553060e6553260e8553660ec553860ee553a60f055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGE_d0g0v0.json
index 3580e7b37..b17385026 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGE_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_OOGE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "9fca40568ed689631c73f1b359864dc84bdf76df34bd2a23b654dc55a257c919"
+            "sourceHash" : "029a21acb24963bdf0077bfe7c42729133ca734da88373c78dfab1ea1a0aae11"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x01588c",
-                    "hash" : "0xf0fea6bee2249220b3a41cd960d374da406208fdd72a9497994aae1dfa513c6a",
-                    "mixHash" : "0x4f9fb86bd90eb5d28944138fa612095c964aa673a37000ca91d569972267d9c2",
-                    "nonce" : "0xcdb4197edcb56759",
+                    "hash" : "0xb4c3f8045b62d00791b252e5409cc9bb2e17114407c9c1712bc406947043ffc0",
+                    "mixHash" : "0xef788532c2c334ee01af535ff8143678686a39402decec2474579a80c34def5e",
+                    "nonce" : "0xa691cfa31912a2ea",
                     "number" : "0x01",
                     "parentHash" : "0x3c38589225fd20026597686a813ae8b3b79cb90819494940869530aa3c96ed7d",
                     "receiptTrie" : "0xfb18c88fc1db8de08a7648b8ab27197ee3d05ab23924bce4196dc532701fa2cb",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a03c38589225fd20026597686a813ae8b3b79cb90819494940869530aa3c96ed7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dbbac11291a339a6576bcd760c0a72e16d878fe00bba1d2d91781c4a34d328ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fb18c88fc1db8de08a7648b8ab27197ee3d05ab23924bce4196dc532701fa2cbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301588c8203e880a04f9fb86bd90eb5d28944138fa612095c964aa673a37000ca91d569972267d9c288cdb4197edcb56759f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a03c38589225fd20026597686a813ae8b3b79cb90819494940869530aa3c96ed7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07dbbac11291a339a6576bcd760c0a72e16d878fe00bba1d2d91781c4a34d328ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fb18c88fc1db8de08a7648b8ab27197ee3d05ab23924bce4196dc532701fa2cbb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301588c8203e880a0ef788532c2c334ee01af535ff8143678686a39402decec2474579a80c34def5e88a691cfa31912a2eaf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0279e17b07153e46ddf47564b53366b19808110199b0b5fdb556828ad40ede0afa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf0fea6bee2249220b3a41cd960d374da406208fdd72a9497994aae1dfa513c6a",
+        "lastblockhash" : "0xb4c3f8045b62d00791b252e5409cc9bb2e17114407c9c1712bc406947043ffc0",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -150,315 +150,13 @@
             }
         }
     },
-    "callcodecallcodecall_110_OOGE_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "9fca40568ed689631c73f1b359864dc84bdf76df34bd2a23b654dc55a257c919"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x01588c",
-                    "hash" : "0x8c2cdea35d73115d96288a7f1c451dd7833e79995d7250d58c02ab25d4f937c8",
-                    "mixHash" : "0xe1199a22bafd01ce584caf55e72672db3929b7f21c582e0200dc1cf899b19fda",
-                    "nonce" : "0xdd1c464ad489e6bc",
-                    "number" : "0x01",
-                    "parentHash" : "0x3c38589225fd20026597686a813ae8b3b79cb90819494940869530aa3c96ed7d",
-                    "receiptTrie" : "0x2978fbebd96a58bc8a987cbcbad9d833a93f5fa506478d0b5c1e2853f11d1d4b",
-                    "stateRoot" : "0x4f7759d7ad0d4442e7555431fd4f4ae3569710863f1726eb0aa4a02dd0ddfe08",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a03c38589225fd20026597686a813ae8b3b79cb90819494940869530aa3c96ed7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f7759d7ad0d4442e7555431fd4f4ae3569710863f1726eb0aa4a02dd0ddfe08a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02978fbebd96a58bc8a987cbcbad9d833a93f5fa506478d0b5c1e2853f11d1d4bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301588c8203e880a0e1199a22bafd01ce584caf55e72672db3929b7f21c582e0200dc1cf899b19fda88dd1c464ad489e6bcf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x3c38589225fd20026597686a813ae8b3b79cb90819494940869530aa3c96ed7d",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x279e17b07153e46ddf47564b53366b19808110199b0b5fdb556828ad40ede0af",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0279e17b07153e46ddf47564b53366b19808110199b0b5fdb556828ad40ede0afa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8c2cdea35d73115d96288a7f1c451dd7833e79995d7250d58c02ab25d4f937c8",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5588c",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762a774",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcodecall_110_OOGE_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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "9fca40568ed689631c73f1b359864dc84bdf76df34bd2a23b654dc55a257c919"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x01588c",
-                    "hash" : "0x977a555f263fb2f1a55e656e0d35243c28db47f8e2b2a762b065b4c07bfb5cc6",
-                    "mixHash" : "0x28105007d47df0fe9abde331f40393e4da0e3a7c16c542c322d2daa13ff33062",
-                    "nonce" : "0x1605e3b32e6c5012",
-                    "number" : "0x01",
-                    "parentHash" : "0x3c38589225fd20026597686a813ae8b3b79cb90819494940869530aa3c96ed7d",
-                    "receiptTrie" : "0x2978fbebd96a58bc8a987cbcbad9d833a93f5fa506478d0b5c1e2853f11d1d4b",
-                    "stateRoot" : "0x4f7759d7ad0d4442e7555431fd4f4ae3569710863f1726eb0aa4a02dd0ddfe08",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a03c38589225fd20026597686a813ae8b3b79cb90819494940869530aa3c96ed7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04f7759d7ad0d4442e7555431fd4f4ae3569710863f1726eb0aa4a02dd0ddfe08a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02978fbebd96a58bc8a987cbcbad9d833a93f5fa506478d0b5c1e2853f11d1d4bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301588c8203e880a028105007d47df0fe9abde331f40393e4da0e3a7c16c542c322d2daa13ff33062881605e3b32e6c5012f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x3c38589225fd20026597686a813ae8b3b79cb90819494940869530aa3c96ed7d",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x279e17b07153e46ddf47564b53366b19808110199b0b5fdb556828ad40ede0af",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0279e17b07153e46ddf47564b53366b19808110199b0b5fdb556828ad40ede0afa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x977a555f263fb2f1a55e656e0d35243c28db47f8e2b2a762b065b4c07bfb5cc6",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5588c",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762a774",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcodecall_110_OOGE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "9fca40568ed689631c73f1b359864dc84bdf76df34bd2a23b654dc55a257c919"
+            "sourceHash" : "029a21acb24963bdf0077bfe7c42729133ca734da88373c78dfab1ea1a0aae11"
         },
         "blocks" : [
             {
@@ -469,9 +167,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "0x8a56d3f399b4fddc5929450e324eb9f9c3c92c19a515669cdf4836f95977385d",
-                    "mixHash" : "0x6b0b21abc14a2af64941101bd12635e33ce2ea6d95e96145796af72f15f7ffba",
-                    "nonce" : "0xa83094a12ce1acaf",
+                    "hash" : "0x76e783c2aa9dc93004d47ba318087bfa3dc10f4f2ee87a5605df504ed2b6f9d6",
+                    "mixHash" : "0xfcb3b5685e599e0a7029dc4671d6373a528c89c5956da21ff0dd01a5d72293bc",
+                    "nonce" : "0x92cd921e68bdb69b",
                     "number" : "0x01",
                     "parentHash" : "0x3c38589225fd20026597686a813ae8b3b79cb90819494940869530aa3c96ed7d",
                     "receiptTrie" : "0xfbc01296bdd7ae685a3f17723b1be0de6f57cf4ee2877e63672f6151eaa51546",
@@ -480,10 +178,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a03c38589225fd20026597686a813ae8b3b79cb90819494940869530aa3c96ed7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e731572280b088c5001ed997be1cbf16a34e7a1942a7d002e737990b5cde2ca8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fbc01296bdd7ae685a3f17723b1be0de6f57cf4ee2877e63672f6151eaa51546b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a06b0b21abc14a2af64941101bd12635e33ce2ea6d95e96145796af72f15f7ffba88a83094a12ce1acaff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a03c38589225fd20026597686a813ae8b3b79cb90819494940869530aa3c96ed7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e731572280b088c5001ed997be1cbf16a34e7a1942a7d002e737990b5cde2ca8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0fbc01296bdd7ae685a3f17723b1be0de6f57cf4ee2877e63672f6151eaa51546b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0fcb3b5685e599e0a7029dc4671d6373a528c89c5956da21ff0dd01a5d72293bc8892cd921e68bdb69bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -517,7 +215,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0279e17b07153e46ddf47564b53366b19808110199b0b5fdb556828ad40ede0afa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8a56d3f399b4fddc5929450e324eb9f9c3c92c19a515669cdf4836f95977385d",
+        "lastblockhash" : "0x76e783c2aa9dc93004d47ba318087bfa3dc10f4f2ee87a5605df504ed2b6f9d6",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -600,156 +298,5 @@
                 }
             }
         }
-    },
-    "callcodecallcodecall_110_OOGE_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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "9fca40568ed689631c73f1b359864dc84bdf76df34bd2a23b654dc55a257c919"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150d0",
-                    "hash" : "0x4344d9ad450444c9e5f76b6bc71931b3873c00012cbd34731f7200a4d1b8c41b",
-                    "mixHash" : "0x01778b7653a24ddc59a48d5c4e2ef8bb88d27f167b5ac27aa6b79577d39dbd0d",
-                    "nonce" : "0x839b2a7e4e53860b",
-                    "number" : "0x01",
-                    "parentHash" : "0x3c38589225fd20026597686a813ae8b3b79cb90819494940869530aa3c96ed7d",
-                    "receiptTrie" : "0x9b42ee6e9ee2907542fdba562a02534a4553eba7efc957834771336ce8152875",
-                    "stateRoot" : "0xb3258d80ef3a6490f2db24295927067a40afce08965e7e89e25a3a7cb4355658",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a03c38589225fd20026597686a813ae8b3b79cb90819494940869530aa3c96ed7da01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3258d80ef3a6490f2db24295927067a40afce08965e7e89e25a3a7cb4355658a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09b42ee6e9ee2907542fdba562a02534a4553eba7efc957834771336ce8152875b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150d08203e880a001778b7653a24ddc59a48d5c4e2ef8bb88d27f167b5ac27aa6b79577d39dbd0d88839b2a7e4e53860bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x3c38589225fd20026597686a813ae8b3b79cb90819494940869530aa3c96ed7d",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x279e17b07153e46ddf47564b53366b19808110199b0b5fdb556828ad40ede0af",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0279e17b07153e46ddf47564b53366b19808110199b0b5fdb556828ad40ede0afa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4344d9ad450444c9e5f76b6bc71931b3873c00012cbd34731f7200a4d1b8c41b",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550d0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af30",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfter_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfter_d0g0v0.json
index 2161b921e..0dadde2de 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfter_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfter_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "764efcf602e6e9cc9f9c4e9ad21b74103b2045c7d2f2404c761aad041dbf3dec"
+            "sourceHash" : "3b84195e20bdb18f71e868d7653b0235579c74e1bbf20f337dde0103800be515"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155fc",
-                    "hash" : "0xab215c656b1947abdf769202210c841c7f60492fd99f22da6c034b0a4c06d49a",
-                    "mixHash" : "0xac409113af40e0dab1fd2bf7bc0159cd88ddb1ef40afd8fb2b364470d9f82ca8",
-                    "nonce" : "0x25b580b96dd82451",
+                    "hash" : "0x8645c9adca4a8cf0f0451a7f7fe712030cc4cbacd44d2fe43b03e6167164fc1b",
+                    "mixHash" : "0x013a35a3f3c3f374d187258de84145ab9552925429486c79e258579c2b36d99c",
+                    "nonce" : "0x591a57049c8f80be",
                     "number" : "0x01",
                     "parentHash" : "0x2cb8aa27743c95bc20a3a6aa380ce3db4bdbde48d09a8214cf897339f24e7847",
                     "receiptTrie" : "0xadfbfdd0bb92dc004bc3dde08ce5b3aeada0bb5a50c9cc31aef4728f50fa6047",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02cb8aa27743c95bc20a3a6aa380ce3db4bdbde48d09a8214cf897339f24e7847a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032d85ac5c2b2bdf7a6a8d0853787c94933ec1a1d4046924ff1dbd0652d4473eba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0adfbfdd0bb92dc004bc3dde08ce5b3aeada0bb5a50c9cc31aef4728f50fa6047b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fc8203e880a0ac409113af40e0dab1fd2bf7bc0159cd88ddb1ef40afd8fb2b364470d9f82ca88825b580b96dd82451f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a02cb8aa27743c95bc20a3a6aa380ce3db4bdbde48d09a8214cf897339f24e7847a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa032d85ac5c2b2bdf7a6a8d0853787c94933ec1a1d4046924ff1dbd0652d4473eba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0adfbfdd0bb92dc004bc3dde08ce5b3aeada0bb5a50c9cc31aef4728f50fa6047b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fc8203e880a0013a35a3f3c3f374d187258de84145ab9552925429486c79e258579c2b36d99c88591a57049c8f80bef862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00777b1de84fbc82ba1a400a21de5411568c963ed24f7f4b3b98811bcf38029fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xab215c656b1947abdf769202210c841c7f60492fd99f22da6c034b0a4c06d49a",
+        "lastblockhash" : "0x8645c9adca4a8cf0f0451a7f7fe712030cc4cbacd44d2fe43b03e6167164fc1b",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -149,313 +149,13 @@
             }
         }
     },
-    "callcodecallcodecall_110_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "764efcf602e6e9cc9f9c4e9ad21b74103b2045c7d2f2404c761aad041dbf3dec"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155fc",
-                    "hash" : "0xfb9e2b869e77330836d239331d5216dedac6d2fca9a34369bd818cb483dc117d",
-                    "mixHash" : "0xe939088d3ee22fc7c1ab1dfbb2613d7916a1c27573349be889c6483630e9a07f",
-                    "nonce" : "0x24013fb862d218f8",
-                    "number" : "0x01",
-                    "parentHash" : "0x2cb8aa27743c95bc20a3a6aa380ce3db4bdbde48d09a8214cf897339f24e7847",
-                    "receiptTrie" : "0x97801756c9427bd2cd37ffc50bb252a2df3007a9eefc02179d701a16a8097ad2",
-                    "stateRoot" : "0xe49c1496075bee37dc339ead53d7fdf2f0caa5e9bb991363c9a74c7c80e544c3",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a02cb8aa27743c95bc20a3a6aa380ce3db4bdbde48d09a8214cf897339f24e7847a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e49c1496075bee37dc339ead53d7fdf2f0caa5e9bb991363c9a74c7c80e544c3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea097801756c9427bd2cd37ffc50bb252a2df3007a9eefc02179d701a16a8097ad2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fc8203e880a0e939088d3ee22fc7c1ab1dfbb2613d7916a1c27573349be889c6483630e9a07f8824013fb862d218f8f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x2cb8aa27743c95bc20a3a6aa380ce3db4bdbde48d09a8214cf897339f24e7847",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x0777b1de84fbc82ba1a400a21de5411568c963ed24f7f4b3b98811bcf38029fe",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00777b1de84fbc82ba1a400a21de5411568c963ed24f7f4b3b98811bcf38029fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfb9e2b869e77330836d239331d5216dedac6d2fca9a34369bd818cb483dc117d",
-        "network" : "EIP150",
-        "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_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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "764efcf602e6e9cc9f9c4e9ad21b74103b2045c7d2f2404c761aad041dbf3dec"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155fc",
-                    "hash" : "0x043b2525c0e4fdf05f0c0a9b96e1ad421b61438dc25b75833bdfedcc0a255456",
-                    "mixHash" : "0xb6e75bf797e29cbe689ad91cb51bdac99aab3c02fdeff1b0686870961e0215c2",
-                    "nonce" : "0xf81a214fa1e7c230",
-                    "number" : "0x01",
-                    "parentHash" : "0x2cb8aa27743c95bc20a3a6aa380ce3db4bdbde48d09a8214cf897339f24e7847",
-                    "receiptTrie" : "0x97801756c9427bd2cd37ffc50bb252a2df3007a9eefc02179d701a16a8097ad2",
-                    "stateRoot" : "0xe49c1496075bee37dc339ead53d7fdf2f0caa5e9bb991363c9a74c7c80e544c3",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a02cb8aa27743c95bc20a3a6aa380ce3db4bdbde48d09a8214cf897339f24e7847a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e49c1496075bee37dc339ead53d7fdf2f0caa5e9bb991363c9a74c7c80e544c3a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea097801756c9427bd2cd37ffc50bb252a2df3007a9eefc02179d701a16a8097ad2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155fc8203e880a0b6e75bf797e29cbe689ad91cb51bdac99aab3c02fdeff1b0686870961e0215c288f81a214fa1e7c230f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x2cb8aa27743c95bc20a3a6aa380ce3db4bdbde48d09a8214cf897339f24e7847",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x0777b1de84fbc82ba1a400a21de5411568c963ed24f7f4b3b98811bcf38029fe",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00777b1de84fbc82ba1a400a21de5411568c963ed24f7f4b3b98811bcf38029fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x043b2525c0e4fdf05f0c0a9b96e1ad421b61438dc25b75833bdfedcc0a255456",
-        "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_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "764efcf602e6e9cc9f9c4e9ad21b74103b2045c7d2f2404c761aad041dbf3dec"
+            "sourceHash" : "3b84195e20bdb18f71e868d7653b0235579c74e1bbf20f337dde0103800be515"
         },
         "blocks" : [
             {
@@ -466,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "0xeb91d328c775b8f08eb646a49ca8f204634a879cc3ff0dd679c2041615a1cf2b",
-                    "mixHash" : "0x6b474a9d80e7a945e2e9349196e5dc164a589688061e4d7dd067d9878252945f",
-                    "nonce" : "0xfe6ba6d788641740",
+                    "hash" : "0xe7b237d5f31fe8dcdcb41f1ea9192745941c70872e72188f01bf900462b7a645",
+                    "mixHash" : "0x68bfbc683ac20d3f75e15bf837e05f5e2f1ca07a338d4d50d786ae9c6103f5ba",
+                    "nonce" : "0x3f0d6a0fa5a81227",
                     "number" : "0x01",
                     "parentHash" : "0x2cb8aa27743c95bc20a3a6aa380ce3db4bdbde48d09a8214cf897339f24e7847",
                     "receiptTrie" : "0x80b44799302b8e9d406aa6bd1202e2a96199ffd759b95a49361594c13b5d256c",
@@ -477,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02cb8aa27743c95bc20a3a6aa380ce3db4bdbde48d09a8214cf897339f24e7847a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3729207adab5a1c3e8b052adc4d30c2c9ca7e84246825ce7879160d0d6f4626a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea080b44799302b8e9d406aa6bd1202e2a96199ffd759b95a49361594c13b5d256cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a06b474a9d80e7a945e2e9349196e5dc164a589688061e4d7dd067d9878252945f88fe6ba6d788641740f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a02cb8aa27743c95bc20a3a6aa380ce3db4bdbde48d09a8214cf897339f24e7847a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3729207adab5a1c3e8b052adc4d30c2c9ca7e84246825ce7879160d0d6f4626a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea080b44799302b8e9d406aa6bd1202e2a96199ffd759b95a49361594c13b5d256cb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a068bfbc683ac20d3f75e15bf837e05f5e2f1ca07a338d4d50d786ae9c6103f5ba883f0d6a0fa5a81227f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -514,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00777b1de84fbc82ba1a400a21de5411568c963ed24f7f4b3b98811bcf38029fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeb91d328c775b8f08eb646a49ca8f204634a879cc3ff0dd679c2041615a1cf2b",
+        "lastblockhash" : "0xe7b237d5f31fe8dcdcb41f1ea9192745941c70872e72188f01bf900462b7a645",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -601,10 +301,10 @@
     "callcodecallcodecall_110_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "764efcf602e6e9cc9f9c4e9ad21b74103b2045c7d2f2404c761aad041dbf3dec"
+            "sourceHash" : "3b84195e20bdb18f71e868d7653b0235579c74e1bbf20f337dde0103800be515"
         },
         "blocks" : [
             {
@@ -615,9 +315,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150c9",
-                    "hash" : "0x31ce4a91658baec460618c5dcebe84106613e80524881064ee21b184b2ec731e",
-                    "mixHash" : "0x2fa50898c48e1c5240129603788f7af9f45945d9850686b31b674606288fc814",
-                    "nonce" : "0xffbdc5f49b2d9660",
+                    "hash" : "0x1632ed23adc79c690a70f06d748053abb88d58ecdbfa07ea6c6ab7a51592199e",
+                    "mixHash" : "0x5b951d73f89b970a514d760a01b7f260b8db545f6f64654d2633a9b1dbb61d95",
+                    "nonce" : "0xb8e3b00a6b98d55a",
                     "number" : "0x01",
                     "parentHash" : "0x2cb8aa27743c95bc20a3a6aa380ce3db4bdbde48d09a8214cf897339f24e7847",
                     "receiptTrie" : "0xf2f8201d3954a240d39c5748d71ba574f27fe834598c581bf765799894b15aa3",
@@ -626,10 +326,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a02cb8aa27743c95bc20a3a6aa380ce3db4bdbde48d09a8214cf897339f24e7847a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa071ad194e1cc957eb5150251f51fe7b1a85c113f1c0087b084968b533dd38e464a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f2f8201d3954a240d39c5748d71ba574f27fe834598c581bf765799894b15aa3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150c98203e880a02fa50898c48e1c5240129603788f7af9f45945d9850686b31b674606288fc81488ffbdc5f49b2d9660f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a02cb8aa27743c95bc20a3a6aa380ce3db4bdbde48d09a8214cf897339f24e7847a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa071ad194e1cc957eb5150251f51fe7b1a85c113f1c0087b084968b533dd38e464a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0f2f8201d3954a240d39c5748d71ba574f27fe834598c581bf765799894b15aa3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150c98203e880a05b951d73f89b970a514d760a01b7f260b8db545f6f64654d2633a9b1dbb61d9588b8e3b00a6b98d55af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -663,7 +363,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00777b1de84fbc82ba1a400a21de5411568c963ed24f7f4b3b98811bcf38029fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x31ce4a91658baec460618c5dcebe84106613e80524881064ee21b184b2ec731e",
+        "lastblockhash" : "0x1632ed23adc79c690a70f06d748053abb88d58ecdbfa07ea6c6ab7a51592199e",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBefore_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBefore_d0g0v0.json
index 331992fb0..7b4ad1cdb 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBefore_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBefore_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_OOGMBefore_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "6094af279f9b9090be21f8ca5cbad2ba6c23c20ba8230b442e5a9810e129cae5"
+            "sourceHash" : "7c957268b817a38b87619a6ef032fe4fb44d520e9867dd5058160f956476ebe3"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155f2",
-                    "hash" : "0x86b3784ba4e9e717d078991435c12422d106ae3ff79ad0a086addd58d38a4770",
-                    "mixHash" : "0xe8022b6684900c70e803757d84e36b71c062dd0eb9c8b68ed0a67138da58aede",
-                    "nonce" : "0x79a4e39c63d3675b",
+                    "hash" : "0x94f7ee0cdd12d4eec6bee52b5d863403a33d59525df3196fd7bb6661b7c25b82",
+                    "mixHash" : "0x5b94758a5326318d8d5f194c48c06cdd5a19371bb835d75ab711dfe1deb7e458",
+                    "nonce" : "0xf60d54e39f079a7a",
                     "number" : "0x01",
                     "parentHash" : "0xe9aca11ae86fb6df7d9f9b7f3f7ac41bea64793741781ce7fbefd08137e082ca",
                     "receiptTrie" : "0x2a915943fc1542045b7198f19755297b59ce8385db010a8f5ace54f3f2315900",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0e9aca11ae86fb6df7d9f9b7f3f7ac41bea64793741781ce7fbefd08137e082caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fa8f65c50a7e1f69b0535e71468202c80f68d86de8217275edd78daf7545252fa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02a915943fc1542045b7198f19755297b59ce8385db010a8f5ace54f3f2315900b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f28203e880a0e8022b6684900c70e803757d84e36b71c062dd0eb9c8b68ed0a67138da58aede8879a4e39c63d3675bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0e9aca11ae86fb6df7d9f9b7f3f7ac41bea64793741781ce7fbefd08137e082caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fa8f65c50a7e1f69b0535e71468202c80f68d86de8217275edd78daf7545252fa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea02a915943fc1542045b7198f19755297b59ce8385db010a8f5ace54f3f2315900b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f28203e880a05b94758a5326318d8d5f194c48c06cdd5a19371bb835d75ab711dfe1deb7e45888f60d54e39f079a7af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a4d3c7bfec91443d8d10f41496791c1669900a106e3ee5a1eac67b432900223a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x86b3784ba4e9e717d078991435c12422d106ae3ff79ad0a086addd58d38a4770",
+        "lastblockhash" : "0x94f7ee0cdd12d4eec6bee52b5d863403a33d59525df3196fd7bb6661b7c25b82",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -149,313 +149,13 @@
             }
         }
     },
-    "callcodecallcodecall_110_OOGMBefore_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "6094af279f9b9090be21f8ca5cbad2ba6c23c20ba8230b442e5a9810e129cae5"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155f2",
-                    "hash" : "0x953d0ea1a857c7d306318673a53c67aefed783f846d51f340e683c228cb7f589",
-                    "mixHash" : "0x1ae6de14d05eb5b14dd4cb10edf64b5512a556446b15a5c9cbfc0b6450b8ca9b",
-                    "nonce" : "0x5c8a666d1e4a175a",
-                    "number" : "0x01",
-                    "parentHash" : "0xe9aca11ae86fb6df7d9f9b7f3f7ac41bea64793741781ce7fbefd08137e082ca",
-                    "receiptTrie" : "0x02387d8133123f46a19a1f073d405c018950cb281d6f8729eb7d2d03518338ec",
-                    "stateRoot" : "0xbe164a27054752e5c7eb1088fa1e6b85e3340470f3bb531f4f559686fd1b9c47",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0e9aca11ae86fb6df7d9f9b7f3f7ac41bea64793741781ce7fbefd08137e082caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0be164a27054752e5c7eb1088fa1e6b85e3340470f3bb531f4f559686fd1b9c47a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea002387d8133123f46a19a1f073d405c018950cb281d6f8729eb7d2d03518338ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f28203e880a01ae6de14d05eb5b14dd4cb10edf64b5512a556446b15a5c9cbfc0b6450b8ca9b885c8a666d1e4a175af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xe9aca11ae86fb6df7d9f9b7f3f7ac41bea64793741781ce7fbefd08137e082ca",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x7a4d3c7bfec91443d8d10f41496791c1669900a106e3ee5a1eac67b432900223",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a4d3c7bfec91443d8d10f41496791c1669900a106e3ee5a1eac67b432900223a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x953d0ea1a857c7d306318673a53c67aefed783f846d51f340e683c228cb7f589",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c94f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555f2",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa0e",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c94f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcodecall_110_OOGMBefore_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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "6094af279f9b9090be21f8ca5cbad2ba6c23c20ba8230b442e5a9810e129cae5"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155f2",
-                    "hash" : "0xf371f0bb36df72d37a747cbb807bb720d58b11fd1aa3fbdcef8016c986e9e547",
-                    "mixHash" : "0xc134bf121cf0cecd0f7f59db2146d898bd0ceb07a3c8768c908143665b106d53",
-                    "nonce" : "0x464b7137fb09a57f",
-                    "number" : "0x01",
-                    "parentHash" : "0xe9aca11ae86fb6df7d9f9b7f3f7ac41bea64793741781ce7fbefd08137e082ca",
-                    "receiptTrie" : "0x02387d8133123f46a19a1f073d405c018950cb281d6f8729eb7d2d03518338ec",
-                    "stateRoot" : "0xbe164a27054752e5c7eb1088fa1e6b85e3340470f3bb531f4f559686fd1b9c47",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0e9aca11ae86fb6df7d9f9b7f3f7ac41bea64793741781ce7fbefd08137e082caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0be164a27054752e5c7eb1088fa1e6b85e3340470f3bb531f4f559686fd1b9c47a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea002387d8133123f46a19a1f073d405c018950cb281d6f8729eb7d2d03518338ecb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155f28203e880a0c134bf121cf0cecd0f7f59db2146d898bd0ceb07a3c8768c908143665b106d5388464b7137fb09a57ff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xe9aca11ae86fb6df7d9f9b7f3f7ac41bea64793741781ce7fbefd08137e082ca",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x7a4d3c7bfec91443d8d10f41496791c1669900a106e3ee5a1eac67b432900223",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a4d3c7bfec91443d8d10f41496791c1669900a106e3ee5a1eac67b432900223a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf371f0bb36df72d37a747cbb807bb720d58b11fd1aa3fbdcef8016c986e9e547",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c94f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555f2",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa0e",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c94f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcodecall_110_OOGMBefore_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "6094af279f9b9090be21f8ca5cbad2ba6c23c20ba8230b442e5a9810e129cae5"
+            "sourceHash" : "7c957268b817a38b87619a6ef032fe4fb44d520e9867dd5058160f956476ebe3"
         },
         "blocks" : [
             {
@@ -466,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "0xc52d7299fad982ac60d3d1f12c05edbb06eb55e10942fc2ceb510b8290e939fe",
-                    "mixHash" : "0x062d927c0b752ea2c50cfc107c9bcb61417e2a7755825219d92cde31c518bebb",
-                    "nonce" : "0xd8dc4e379dce89c4",
+                    "hash" : "0x560f602c97f5e2f752c518c6562814af62bd8737760811dbfe4d8fa7eae61e3a",
+                    "mixHash" : "0xe12550c5fb9b05d29ca08ae2377f7045c9db63bd5f734b2d3f6e802d661fc695",
+                    "nonce" : "0x442b39ecf82ac2a5",
                     "number" : "0x01",
                     "parentHash" : "0xe9aca11ae86fb6df7d9f9b7f3f7ac41bea64793741781ce7fbefd08137e082ca",
                     "receiptTrie" : "0xe64853d731b24fc9cccb6ebda4d2bd537aaddddedf6915db960c7e7262b19ff9",
@@ -477,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0e9aca11ae86fb6df7d9f9b7f3f7ac41bea64793741781ce7fbefd08137e082caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d17631da5b83959de861ddb8d58e8fe25a578afe6b2f2b01b09c1cf17f5c414a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e64853d731b24fc9cccb6ebda4d2bd537aaddddedf6915db960c7e7262b19ff9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0062d927c0b752ea2c50cfc107c9bcb61417e2a7755825219d92cde31c518bebb88d8dc4e379dce89c4f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0e9aca11ae86fb6df7d9f9b7f3f7ac41bea64793741781ce7fbefd08137e082caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d17631da5b83959de861ddb8d58e8fe25a578afe6b2f2b01b09c1cf17f5c414a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e64853d731b24fc9cccb6ebda4d2bd537aaddddedf6915db960c7e7262b19ff9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0e12550c5fb9b05d29ca08ae2377f7045c9db63bd5f734b2d3f6e802d661fc69588442b39ecf82ac2a5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -514,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a4d3c7bfec91443d8d10f41496791c1669900a106e3ee5a1eac67b432900223a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc52d7299fad982ac60d3d1f12c05edbb06eb55e10942fc2ceb510b8290e939fe",
+        "lastblockhash" : "0x560f602c97f5e2f752c518c6562814af62bd8737760811dbfe4d8fa7eae61e3a",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -597,155 +297,5 @@
                 }
             }
         }
-    },
-    "callcodecallcodecall_110_OOGMBefore_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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "6094af279f9b9090be21f8ca5cbad2ba6c23c20ba8230b442e5a9810e129cae5"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150ca",
-                    "hash" : "0xfa9d77b9c4eff8a11b5679f8899ac41e5ab1d19e73757e94428c4c97d2692111",
-                    "mixHash" : "0xeb12bb83d9720111bf7e48d2a612327835b85f79bd7f2131eef35244b415bd2d",
-                    "nonce" : "0xb2a0bedf83d89c56",
-                    "number" : "0x01",
-                    "parentHash" : "0xe9aca11ae86fb6df7d9f9b7f3f7ac41bea64793741781ce7fbefd08137e082ca",
-                    "receiptTrie" : "0x06beac32cbbd432bb278cfb771874d8f1445d23e59be8ef573230ad32246b946",
-                    "stateRoot" : "0x11179f1a60a75a2b83f224c90e49d6e18efa088c40079edd821ce4b8c67202c8",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0e9aca11ae86fb6df7d9f9b7f3f7ac41bea64793741781ce7fbefd08137e082caa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa011179f1a60a75a2b83f224c90e49d6e18efa088c40079edd821ce4b8c67202c8a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea006beac32cbbd432bb278cfb771874d8f1445d23e59be8ef573230ad32246b946b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150ca8203e880a0eb12bb83d9720111bf7e48d2a612327835b85f79bd7f2131eef35244b415bd2d88b2a0bedf83d89c56f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xe9aca11ae86fb6df7d9f9b7f3f7ac41bea64793741781ce7fbefd08137e082ca",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x7a4d3c7bfec91443d8d10f41496791c1669900a106e3ee5a1eac67b432900223",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a4d3c7bfec91443d8d10f41496791c1669900a106e3ee5a1eac67b432900223a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfa9d77b9c4eff8a11b5679f8899ac41e5ab1d19e73757e94428c4c97d2692111",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c94f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550ca",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af36",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c94f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x600160035260406000604060006000731000000000000000000000000000000000000003614e34f2600255",
-                "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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEnd_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEnd_d0g0v0.json
index 84238a753..21451444f 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEnd_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEnd_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_SuicideEnd_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "da3bc1aba09f727f142e2158beac57e834ec5653a5e8039a703961978a035d2e"
+            "sourceHash" : "84872131ddff7203a7d8ebf3af8bd62991314e6f77ac8177d9dd9a71730cd1b2"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0148e1",
-                    "hash" : "0x9c2e808f693ea3af4878445a301f4a0665960b55227b44ce61ccc5d1efb6236e",
-                    "mixHash" : "0xc45019361ac2c7469da1f0952dea66b5877f5a11accb2a1739f13abbb0acd66c",
-                    "nonce" : "0x1a83a5cb2ac38f27",
+                    "hash" : "0x8f21251e49d69caa573bd2143d44e0af656a51a2cb849150d0fc946d6f1969c6",
+                    "mixHash" : "0x9dfd193c1c22c8d8c8139c0e908090ab29bc992b011407f396460690a06a612b",
+                    "nonce" : "0xe5183df8b7d5b1a5",
                     "number" : "0x01",
                     "parentHash" : "0xfae86b7cc6750ccc6c4ad57041e8fd7de87e6e45664ab279216dd68074d90c51",
                     "receiptTrie" : "0xcf9330598ab7451b4f09a6b088820b464ad884bf3a1d818226bd82ec45c18b0d",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0fae86b7cc6750ccc6c4ad57041e8fd7de87e6e45664ab279216dd68074d90c51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07717e6d092dcf857c3daf6c075c41d2ff7bf26f62abe2ce669255279dd6bca2aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0cf9330598ab7451b4f09a6b088820b464ad884bf3a1d818226bd82ec45c18b0db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e18203e880a0c45019361ac2c7469da1f0952dea66b5877f5a11accb2a1739f13abbb0acd66c881a83a5cb2ac38f27f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0fae86b7cc6750ccc6c4ad57041e8fd7de87e6e45664ab279216dd68074d90c51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07717e6d092dcf857c3daf6c075c41d2ff7bf26f62abe2ce669255279dd6bca2aa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0cf9330598ab7451b4f09a6b088820b464ad884bf3a1d818226bd82ec45c18b0db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e18203e880a09dfd193c1c22c8d8c8139c0e908090ab29bc992b011407f396460690a06a612b88e5183df8b7d5b1a5f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ebe24e287a6a803bfea59f8a4ec595b5ee065315d46aa398520706ad6feccfa5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9c2e808f693ea3af4878445a301f4a0665960b55227b44ce61ccc5d1efb6236e",
+        "lastblockhash" : "0x8f21251e49d69caa573bd2143d44e0af656a51a2cb849150d0fc946d6f1969c6",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -141,297 +141,13 @@
             }
         }
     },
-    "callcodecallcodecall_110_SuicideEnd_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "da3bc1aba09f727f142e2158beac57e834ec5653a5e8039a703961978a035d2e"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0148e1",
-                    "hash" : "0xb94614a80884494be6bc8fde8a5762d0529dd475e9c04bb872ac2025a2555d53",
-                    "mixHash" : "0x52081465b48f910a3e861c21d5a84911f2aca9bcf008b0f4d72941540bb9cb1d",
-                    "nonce" : "0x3bf3fa4ecb23f823",
-                    "number" : "0x01",
-                    "parentHash" : "0xfae86b7cc6750ccc6c4ad57041e8fd7de87e6e45664ab279216dd68074d90c51",
-                    "receiptTrie" : "0x5867c437974578e5a1b7039697c5d1929f2c9ab8afe66306abfcfc17cacf0fce",
-                    "stateRoot" : "0x955f87ccf0d5d2e2004b886825b4f070a1c9cd19439e70c407ac98cd9f1fd967",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0fae86b7cc6750ccc6c4ad57041e8fd7de87e6e45664ab279216dd68074d90c51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0955f87ccf0d5d2e2004b886825b4f070a1c9cd19439e70c407ac98cd9f1fd967a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05867c437974578e5a1b7039697c5d1929f2c9ab8afe66306abfcfc17cacf0fceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e18203e880a052081465b48f910a3e861c21d5a84911f2aca9bcf008b0f4d72941540bb9cb1d883bf3fa4ecb23f823f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xfae86b7cc6750ccc6c4ad57041e8fd7de87e6e45664ab279216dd68074d90c51",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xebe24e287a6a803bfea59f8a4ec595b5ee065315d46aa398520706ad6feccfa5",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ebe24e287a6a803bfea59f8a4ec595b5ee065315d46aa398520706ad6feccfa5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb94614a80884494be6bc8fde8a5762d0529dd475e9c04bb872ac2025a2555d53",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b5fb6fe400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548e1",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762b71f",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcodecall_110_SuicideEnd_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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "da3bc1aba09f727f142e2158beac57e834ec5653a5e8039a703961978a035d2e"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0148e1",
-                    "hash" : "0x313ad4ad0d9ba0f1aae45f3c097e0770ba46346d069adb8f3b054ded9ec94eea",
-                    "mixHash" : "0x9facf863df72d810ad543984484ac985a4aea6d3944005fbc28f1b58dc7f5c2d",
-                    "nonce" : "0xc7dd91bda8e79c91",
-                    "number" : "0x01",
-                    "parentHash" : "0xfae86b7cc6750ccc6c4ad57041e8fd7de87e6e45664ab279216dd68074d90c51",
-                    "receiptTrie" : "0x5867c437974578e5a1b7039697c5d1929f2c9ab8afe66306abfcfc17cacf0fce",
-                    "stateRoot" : "0x955f87ccf0d5d2e2004b886825b4f070a1c9cd19439e70c407ac98cd9f1fd967",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0fae86b7cc6750ccc6c4ad57041e8fd7de87e6e45664ab279216dd68074d90c51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0955f87ccf0d5d2e2004b886825b4f070a1c9cd19439e70c407ac98cd9f1fd967a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05867c437974578e5a1b7039697c5d1929f2c9ab8afe66306abfcfc17cacf0fceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830148e18203e880a09facf863df72d810ad543984484ac985a4aea6d3944005fbc28f1b58dc7f5c2d88c7dd91bda8e79c91f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xfae86b7cc6750ccc6c4ad57041e8fd7de87e6e45664ab279216dd68074d90c51",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xebe24e287a6a803bfea59f8a4ec595b5ee065315d46aa398520706ad6feccfa5",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ebe24e287a6a803bfea59f8a4ec595b5ee065315d46aa398520706ad6feccfa5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x313ad4ad0d9ba0f1aae45f3c097e0770ba46346d069adb8f3b054ded9ec94eea",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b5fb6fe400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f548e1",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762b71f",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcodecall_110_SuicideEnd_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "da3bc1aba09f727f142e2158beac57e834ec5653a5e8039a703961978a035d2e"
+            "sourceHash" : "84872131ddff7203a7d8ebf3af8bd62991314e6f77ac8177d9dd9a71730cd1b2"
         },
         "blocks" : [
             {
@@ -442,9 +158,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0xbf134d7775c95ca129b6592ae9b6ac95547bbcb3b12bc90f82b23751ee13fb12",
-                    "mixHash" : "0x08056e68fa771b2498fad2221ba3dc9284e7bf9b7fb623c82aea25b3dc84486a",
-                    "nonce" : "0x4fb0e489fdfd82ef",
+                    "hash" : "0xe50ce0fc71720003fafce89873216ca4cbff2a451cc9fd5f23f21d60b3837b49",
+                    "mixHash" : "0xac0c2e58a2c3e4b6340b36056cb97c598ca30c62ed9800e6de21e722ea8a4003",
+                    "nonce" : "0x51232d955a4ba024",
                     "number" : "0x01",
                     "parentHash" : "0xfae86b7cc6750ccc6c4ad57041e8fd7de87e6e45664ab279216dd68074d90c51",
                     "receiptTrie" : "0x5ae759dc862bea686e046a486187b445a50d2464ac39dda6c584cccf3c5e71f1",
@@ -453,10 +169,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0fae86b7cc6750ccc6c4ad57041e8fd7de87e6e45664ab279216dd68074d90c51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a75605f7abc3f5610d85c488cc8456b89290e3f2080de4b22f88e84e32d705cfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05ae759dc862bea686e046a486187b445a50d2464ac39dda6c584cccf3c5e71f1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a008056e68fa771b2498fad2221ba3dc9284e7bf9b7fb623c82aea25b3dc84486a884fb0e489fdfd82eff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0fae86b7cc6750ccc6c4ad57041e8fd7de87e6e45664ab279216dd68074d90c51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a75605f7abc3f5610d85c488cc8456b89290e3f2080de4b22f88e84e32d705cfa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05ae759dc862bea686e046a486187b445a50d2464ac39dda6c584cccf3c5e71f1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0ac0c2e58a2c3e4b6340b36056cb97c598ca30c62ed9800e6de21e722ea8a40038851232d955a4ba024f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -490,7 +206,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ebe24e287a6a803bfea59f8a4ec595b5ee065315d46aa398520706ad6feccfa5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbf134d7775c95ca129b6592ae9b6ac95547bbcb3b12bc90f82b23751ee13fb12",
+        "lastblockhash" : "0xe50ce0fc71720003fafce89873216ca4cbff2a451cc9fd5f23f21d60b3837b49",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -573,147 +289,5 @@
                 }
             }
         }
-    },
-    "callcodecallcodecall_110_SuicideEnd_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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "da3bc1aba09f727f142e2158beac57e834ec5653a5e8039a703961978a035d2e"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x012d9d",
-                    "hash" : "0x10d87586939edd26e50b4c49e6304fcb8aff42fc4ad886372abd09995d97aec9",
-                    "mixHash" : "0x1e19760e77b8f2c49d8249e802bb76daa80f570cf8657bd6ff35a43d26af208e",
-                    "nonce" : "0x4e5a559fa88e6331",
-                    "number" : "0x01",
-                    "parentHash" : "0xfae86b7cc6750ccc6c4ad57041e8fd7de87e6e45664ab279216dd68074d90c51",
-                    "receiptTrie" : "0x825b5bf5215bc859edeb3a6c97874f007808a94f4a38eae92117e5ef3d0c9851",
-                    "stateRoot" : "0xf852a8b0e4bfcdd6ef49fa160afbe5a36588099ff9fb0eea83d85bf520aec67e",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0fae86b7cc6750ccc6c4ad57041e8fd7de87e6e45664ab279216dd68074d90c51a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f852a8b0e4bfcdd6ef49fa160afbe5a36588099ff9fb0eea83d85bf520aec67ea05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0825b5bf5215bc859edeb3a6c97874f007808a94f4a38eae92117e5ef3d0c9851b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083012d9d8203e880a01e19760e77b8f2c49d8249e802bb76daa80f570cf8657bd6ff35a43d26af208e884e5a559fa88e6331f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xfae86b7cc6750ccc6c4ad57041e8fd7de87e6e45664ab279216dd68074d90c51",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xebe24e287a6a803bfea59f8a4ec595b5ee065315d46aa398520706ad6feccfa5",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ebe24e287a6a803bfea59f8a4ec595b5ee065315d46aa398520706ad6feccfa5a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x10d87586939edd26e50b4c49e6304fcb8aff42fc4ad886372abd09995d97aec9",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b5fb6fe400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f52d9d",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762d263",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000600073100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddle_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddle_d0g0v0.json
index d9de309ab..35087c029 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddle_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddle_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_SuicideMiddle_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "1c27698968f2aafa5b55315e06544a8e25ff76a6f26a09972fd8b17b08748a01"
+            "sourceHash" : "796524dd327c11b1578f83e77f333ee65a4048dd2e584192435578d0aa93e69d"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c1",
-                    "hash" : "0x1fa51495de76082e9ed554b575df8ccd984cde774bcf1fede080e353b968cd2d",
-                    "mixHash" : "0x1b2a40a33dbef721d4fe248ba262780e23e12f8dfe53dd04019be02371269fd7",
-                    "nonce" : "0xe493305a84310152",
+                    "hash" : "0x39a79ff637f82ebaa12b7f8190aa897e9ee5fa45b63dc13719df1e0649324cde",
+                    "mixHash" : "0x5724cac9aec268257099032685e128d7c3bf3842e0ac76e9955637848b1e24fd",
+                    "nonce" : "0x5b9dd50f7972b577",
                     "number" : "0x01",
                     "parentHash" : "0x3bc11f1b6544ebdabde18f84f7ed8812ce41aad41e81f2389a4819aa90552c23",
                     "receiptTrie" : "0xd4f71be0d5272c9236c0306000d02d23b7c1d4808e9bc5439aa72218a351a6c7",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03bc11f1b6544ebdabde18f84f7ed8812ce41aad41e81f2389a4819aa90552c23a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b68c6d492378fab698960572b8a60e6bcb412a8830efc31a940048ba1aa8cfcda05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d4f71be0d5272c9236c0306000d02d23b7c1d4808e9bc5439aa72218a351a6c7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c18203e880a01b2a40a33dbef721d4fe248ba262780e23e12f8dfe53dd04019be02371269fd788e493305a84310152f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a03bc11f1b6544ebdabde18f84f7ed8812ce41aad41e81f2389a4819aa90552c23a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b68c6d492378fab698960572b8a60e6bcb412a8830efc31a940048ba1aa8cfcda05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d4f71be0d5272c9236c0306000d02d23b7c1d4808e9bc5439aa72218a351a6c7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c18203e880a05724cac9aec268257099032685e128d7c3bf3842e0ac76e9955637848b1e24fd885b9dd50f7972b577f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035b99ac3c685b4498b6a307047ed74ea2a0f2e330be9bf4f7626c34db9793ea4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1fa51495de76082e9ed554b575df8ccd984cde774bcf1fede080e353b968cd2d",
+        "lastblockhash" : "0x39a79ff637f82ebaa12b7f8190aa897e9ee5fa45b63dc13719df1e0649324cde",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -141,297 +141,13 @@
             }
         }
     },
-    "callcodecallcodecall_110_SuicideMiddle_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "1c27698968f2aafa5b55315e06544a8e25ff76a6f26a09972fd8b17b08748a01"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c1",
-                    "hash" : "0x0e4b1fd806212e4426599b53099c1f4915666b0f8ecaab12d32e780706187734",
-                    "mixHash" : "0xec6c26c9035842839cce6de0637ceefe54eb79dedf7a22d51ccba1738199e1ed",
-                    "nonce" : "0x7a6ca3f48ac0ec2d",
-                    "number" : "0x01",
-                    "parentHash" : "0x3bc11f1b6544ebdabde18f84f7ed8812ce41aad41e81f2389a4819aa90552c23",
-                    "receiptTrie" : "0xd87bdcbd70122be6e9c00c7a40341304f5a38d9d572e1257b9410d55f60f23b0",
-                    "stateRoot" : "0xd2247c189b5d8d7d3371e21f1654cbd7ce92c0685a6e3503917b16b4ad7730c4",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a03bc11f1b6544ebdabde18f84f7ed8812ce41aad41e81f2389a4819aa90552c23a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2247c189b5d8d7d3371e21f1654cbd7ce92c0685a6e3503917b16b4ad7730c4a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d87bdcbd70122be6e9c00c7a40341304f5a38d9d572e1257b9410d55f60f23b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c18203e880a0ec6c26c9035842839cce6de0637ceefe54eb79dedf7a22d51ccba1738199e1ed887a6ca3f48ac0ec2df862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x3bc11f1b6544ebdabde18f84f7ed8812ce41aad41e81f2389a4819aa90552c23",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x35b99ac3c685b4498b6a307047ed74ea2a0f2e330be9bf4f7626c34db9793ea4",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035b99ac3c685b4498b6a307047ed74ea2a0f2e330be9bf4f7626c34db9793ea4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0e4b1fd806212e4426599b53099c1f4915666b0f8ecaab12d32e780706187734",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c1",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a763563f",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcodecall_110_SuicideMiddle_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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "1c27698968f2aafa5b55315e06544a8e25ff76a6f26a09972fd8b17b08748a01"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c1",
-                    "hash" : "0x9b989fd391d63cdae916f2fd73846c31d46b7ea00efc95afaad7a1ed6f7bf2b8",
-                    "mixHash" : "0x8b55cfc5537d0f1d7212839f209da0c767960111e26eeb8075786960afa0a05c",
-                    "nonce" : "0xfcaa26a0b4e886ac",
-                    "number" : "0x01",
-                    "parentHash" : "0x3bc11f1b6544ebdabde18f84f7ed8812ce41aad41e81f2389a4819aa90552c23",
-                    "receiptTrie" : "0xd87bdcbd70122be6e9c00c7a40341304f5a38d9d572e1257b9410d55f60f23b0",
-                    "stateRoot" : "0xd2247c189b5d8d7d3371e21f1654cbd7ce92c0685a6e3503917b16b4ad7730c4",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a03bc11f1b6544ebdabde18f84f7ed8812ce41aad41e81f2389a4819aa90552c23a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d2247c189b5d8d7d3371e21f1654cbd7ce92c0685a6e3503917b16b4ad7730c4a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d87bdcbd70122be6e9c00c7a40341304f5a38d9d572e1257b9410d55f60f23b0b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c18203e880a08b55cfc5537d0f1d7212839f209da0c767960111e26eeb8075786960afa0a05c88fcaa26a0b4e886acf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x3bc11f1b6544ebdabde18f84f7ed8812ce41aad41e81f2389a4819aa90552c23",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x35b99ac3c685b4498b6a307047ed74ea2a0f2e330be9bf4f7626c34db9793ea4",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035b99ac3c685b4498b6a307047ed74ea2a0f2e330be9bf4f7626c34db9793ea4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9b989fd391d63cdae916f2fd73846c31d46b7ea00efc95afaad7a1ed6f7bf2b8",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c1",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a763563f",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcodecall_110_SuicideMiddle_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "1c27698968f2aafa5b55315e06544a8e25ff76a6f26a09972fd8b17b08748a01"
+            "sourceHash" : "796524dd327c11b1578f83e77f333ee65a4048dd2e584192435578d0aa93e69d"
         },
         "blocks" : [
             {
@@ -442,9 +158,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0xea0eb47bdcd1828b6fcc45e265e57e99f273b290eedb6c269fb22780beae3a3b",
-                    "mixHash" : "0xd0d87f5e6012e6061cc1ff746da3dba306a1975d00936b8dcbd04f90e2448ef1",
-                    "nonce" : "0x430a4cda5df389ac",
+                    "hash" : "0x25b3fb8a8fa2e8502fc012f4ea301732a0342f08b643c97664e1b21f2d97c654",
+                    "mixHash" : "0x33edb7daad90d266afe3e3f727dda7fa3f095aff0bcca3e0e371f33bc918942e",
+                    "nonce" : "0xbb6baaa5c25f7e49",
                     "number" : "0x01",
                     "parentHash" : "0x3bc11f1b6544ebdabde18f84f7ed8812ce41aad41e81f2389a4819aa90552c23",
                     "receiptTrie" : "0x5eb10c7abbd4787a0bfcafdab6fb03a6e378e88d37e008e08ea793af20544665",
@@ -453,10 +169,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a03bc11f1b6544ebdabde18f84f7ed8812ce41aad41e81f2389a4819aa90552c23a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03daea86dd0516e3da32e9aa0458c640265b22ad718c823ad0039096aecb68eb5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05eb10c7abbd4787a0bfcafdab6fb03a6e378e88d37e008e08ea793af20544665b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0d0d87f5e6012e6061cc1ff746da3dba306a1975d00936b8dcbd04f90e2448ef188430a4cda5df389acf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a03bc11f1b6544ebdabde18f84f7ed8812ce41aad41e81f2389a4819aa90552c23a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03daea86dd0516e3da32e9aa0458c640265b22ad718c823ad0039096aecb68eb5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a05eb10c7abbd4787a0bfcafdab6fb03a6e378e88d37e008e08ea793af20544665b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a033edb7daad90d266afe3e3f727dda7fa3f095aff0bcca3e0e371f33bc918942e88bb6baaa5c25f7e49f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -490,7 +206,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035b99ac3c685b4498b6a307047ed74ea2a0f2e330be9bf4f7626c34db9793ea4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xea0eb47bdcd1828b6fcc45e265e57e99f273b290eedb6c269fb22780beae3a3b",
+        "lastblockhash" : "0x25b3fb8a8fa2e8502fc012f4ea301732a0342f08b643c97664e1b21f2d97c654",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -573,147 +289,5 @@
                 }
             }
         }
-    },
-    "callcodecallcodecall_110_SuicideMiddle_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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "1c27698968f2aafa5b55315e06544a8e25ff76a6f26a09972fd8b17b08748a01"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x9111",
-                    "hash" : "0xbcddc3e3ca4babd0a49a17bf7399712be81a080b885074bdd48f93bb41907863",
-                    "mixHash" : "0x12fdb2b33b5fb384ec61ff2a0ab290df99c8b25112899d789de05e262b0024f6",
-                    "nonce" : "0xb772e5657e5b2e21",
-                    "number" : "0x01",
-                    "parentHash" : "0x3bc11f1b6544ebdabde18f84f7ed8812ce41aad41e81f2389a4819aa90552c23",
-                    "receiptTrie" : "0xe2c2cd21ff6f8f8726fa4cc3604baed91fa065ed93c326ca3ee4fa73654c3f82",
-                    "stateRoot" : "0x9a7ef0bd03d1165fd0447e84842040e2227cb344941072911e3170df9991eb18",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a03bc11f1b6544ebdabde18f84f7ed8812ce41aad41e81f2389a4819aa90552c23a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09a7ef0bd03d1165fd0447e84842040e2227cb344941072911e3170df9991eb18a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0e2c2cd21ff6f8f8726fa4cc3604baed91fa065ed93c326ca3ee4fa73654c3f82b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291118203e880a012fdb2b33b5fb384ec61ff2a0ab290df99c8b25112899d789de05e262b0024f688b772e5657e5b2e21f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x3bc11f1b6544ebdabde18f84f7ed8812ce41aad41e81f2389a4819aa90552c23",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x35b99ac3c685b4498b6a307047ed74ea2a0f2e330be9bf4f7626c34db9793ea4",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa035b99ac3c685b4498b6a307047ed74ea2a0f2e330be9bf4f7626c34db9793ea4a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbcddc3e3ca4babd0a49a17bf7399712be81a080b885074bdd48f93bb41907863",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49111",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7636eef",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff6040600060406000600073100000000000000000000000000000000000000361c350f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_d0g0v0.json
index 381fd2cf0..86cb308e0 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_110_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_d0g0v0Filler.json",
-            "sourceHash" : "cb9b6feb4929a40b20955487ef3a375837c85b235fa067c5d22224b5f3be1efb"
+            "sourceHash" : "4b317e425211d2a1777caf9b29185a38e8e5e6471ba8b9e287627c1e2ffe76a8"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x046c8f",
-                    "hash" : "0x06e81cb1f2f6f8f4f7125ecc66bb6ea7d917b422d7beab658eee239640d45d6d",
-                    "mixHash" : "0x88c13f87d4d6081a4d2e7945700fe5a6f71d3efbb5c497fa4241882be8310a58",
-                    "nonce" : "0x466dd9db5c228cae",
+                    "hash" : "0xe55166101b1230ac74734bc6b0659ac93ae127ef17a741b94ed1f99ae6afcaac",
+                    "mixHash" : "0xaf173f648a6c5b905e63c889ecd882b0e7ac5c54c75ec1aa5d1a868ccc9f74bb",
+                    "nonce" : "0xcc4d6a703c091d22",
                     "number" : "0x01",
                     "parentHash" : "0x472826fea98fba03420ce35795e1324e55e54e65136eba530f129cfa30ccad12",
                     "receiptTrie" : "0xfe7f8de3ef6822a48af4e87712534d1451644a8a9744a86752c749a5cbf57f30",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0472826fea98fba03420ce35795e1324e55e54e65136eba530f129cfa30ccad12a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00244bd800ca4e839815be0113d06df9a77d9d999af274646adb691c4b0038af5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0fe7f8de3ef6822a48af4e87712534d1451644a8a9744a86752c749a5cbf57f30b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083046c8f8203e880a088c13f87d4d6081a4d2e7945700fe5a6f71d3efbb5c497fa4241882be8310a5888466dd9db5c228caef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0472826fea98fba03420ce35795e1324e55e54e65136eba530f129cfa30ccad12a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00244bd800ca4e839815be0113d06df9a77d9d999af274646adb691c4b0038af5a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0fe7f8de3ef6822a48af4e87712534d1451644a8a9744a86752c749a5cbf57f30b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083046c8f8203e880a0af173f648a6c5b905e63c889ecd882b0e7ac5c54c75ec1aa5d1a868ccc9f74bb88cc4d6a703c091d22f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069d1465af200da8840c0d59c0e0cb3d5ae6172a73799a034a824e9888c89a618a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x06e81cb1f2f6f8f4f7125ecc66bb6ea7d917b422d7beab658eee239640d45d6d",
+        "lastblockhash" : "0xe55166101b1230ac74734bc6b0659ac93ae127ef17a741b94ed1f99ae6afcaac",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -161,337 +161,13 @@
             }
         }
     },
-    "callcodecallcodecall_110_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_d0g0v0Filler.json",
-            "sourceHash" : "cb9b6feb4929a40b20955487ef3a375837c85b235fa067c5d22224b5f3be1efb"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x046c8f",
-                    "hash" : "0x347c1053c4307ed11bcee93da115c13ea8a71af2fde823145567b67584423d9f",
-                    "mixHash" : "0x5d784e67888226eb73ac9ff67d4ad8f3a263e8b3309c8cca6058424413500892",
-                    "nonce" : "0xcfb2b6504f89a5f0",
-                    "number" : "0x01",
-                    "parentHash" : "0x472826fea98fba03420ce35795e1324e55e54e65136eba530f129cfa30ccad12",
-                    "receiptTrie" : "0x01ed3209778332088782cc8f6de7dc1a4d2c90518660832b02c8dd9308bde10a",
-                    "stateRoot" : "0x14132027e2ed6a1c466cfa5c192b0edc6917b442590d518a7a511616d54c41a9",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0472826fea98fba03420ce35795e1324e55e54e65136eba530f129cfa30ccad12a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa014132027e2ed6a1c466cfa5c192b0edc6917b442590d518a7a511616d54c41a9a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a001ed3209778332088782cc8f6de7dc1a4d2c90518660832b02c8dd9308bde10ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083046c8f8203e880a05d784e67888226eb73ac9ff67d4ad8f3a263e8b3309c8cca605842441350089288cfb2b6504f89a5f0f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x472826fea98fba03420ce35795e1324e55e54e65136eba530f129cfa30ccad12",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x69d1465af200da8840c0d59c0e0cb3d5ae6172a73799a034a824e9888c89a618",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069d1465af200da8840c0d59c0e0cb3d5ae6172a73799a034a824e9888c89a618a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x347c1053c4307ed11bcee93da115c13ea8a71af2fde823145567b67584423d9f",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x014a" : "0x1000000000000000000000000000000000000000",
-                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x0150" : "0x40",
-                    "0x0152" : "0x26",
-                    "0x0154" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01",
-                    "0x04" : "0x1000000000000000000000000000000000000000",
-                    "0x05" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x06" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x07" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f460015533600555",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060017310000000000000000000000000000000000000036203d090f260025533600655",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f86c8f",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75f9371",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f460015533600555",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060017310000000000000000000000000000000000000036203d090f260025533600655",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcodecall_110_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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_d0g0v0Filler.json",
-            "sourceHash" : "cb9b6feb4929a40b20955487ef3a375837c85b235fa067c5d22224b5f3be1efb"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x046c8f",
-                    "hash" : "0xe632f7a2784899b142425024541b765b2526a7bd26f0ce7fa08c6946a92c4788",
-                    "mixHash" : "0x34abf3dd8556e7293225263e8655b7d05a792a5c230d68113112cd1f7e14975d",
-                    "nonce" : "0x5b6d9ed5ae29fe0f",
-                    "number" : "0x01",
-                    "parentHash" : "0x472826fea98fba03420ce35795e1324e55e54e65136eba530f129cfa30ccad12",
-                    "receiptTrie" : "0x01ed3209778332088782cc8f6de7dc1a4d2c90518660832b02c8dd9308bde10a",
-                    "stateRoot" : "0x14132027e2ed6a1c466cfa5c192b0edc6917b442590d518a7a511616d54c41a9",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0472826fea98fba03420ce35795e1324e55e54e65136eba530f129cfa30ccad12a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa014132027e2ed6a1c466cfa5c192b0edc6917b442590d518a7a511616d54c41a9a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a001ed3209778332088782cc8f6de7dc1a4d2c90518660832b02c8dd9308bde10ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083046c8f8203e880a034abf3dd8556e7293225263e8655b7d05a792a5c230d68113112cd1f7e14975d885b6d9ed5ae29fe0ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x472826fea98fba03420ce35795e1324e55e54e65136eba530f129cfa30ccad12",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x69d1465af200da8840c0d59c0e0cb3d5ae6172a73799a034a824e9888c89a618",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069d1465af200da8840c0d59c0e0cb3d5ae6172a73799a034a824e9888c89a618a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe632f7a2784899b142425024541b765b2526a7bd26f0ce7fa08c6946a92c4788",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x014a" : "0x1000000000000000000000000000000000000000",
-                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x0150" : "0x40",
-                    "0x0152" : "0x26",
-                    "0x0154" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01",
-                    "0x04" : "0x1000000000000000000000000000000000000000",
-                    "0x05" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x06" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x07" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f460015533600555",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060017310000000000000000000000000000000000000036203d090f260025533600655",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f86c8f",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75f9371",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f460015533600555",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060017310000000000000000000000000000000000000036203d090f260025533600655",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcodecall_110_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_d0g0v0Filler.json",
-            "sourceHash" : "cb9b6feb4929a40b20955487ef3a375837c85b235fa067c5d22224b5f3be1efb"
+            "sourceHash" : "4b317e425211d2a1777caf9b29185a38e8e5e6471ba8b9e287627c1e2ffe76a8"
         },
         "blocks" : [
             {
@@ -502,9 +178,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x32afddd924bff81fdd20f81de471f30b0469f0fc9165db6ff07bc8c46918575d",
-                    "mixHash" : "0x7e1a19f876641ff3be099165ec5de5c101c119b717b586f7b9cc79c6aa867c62",
-                    "nonce" : "0xea43d13c46f437d7",
+                    "hash" : "0x983752cc85fac65822553984ac4531a0fec82188c101aed8f2295a31b2552270",
+                    "mixHash" : "0x64104fa8051a284ce16743679e573396f4760f21d591e08888bf52efc3bc0b14",
+                    "nonce" : "0x814aafe57ea3f856",
                     "number" : "0x01",
                     "parentHash" : "0x472826fea98fba03420ce35795e1324e55e54e65136eba530f129cfa30ccad12",
                     "receiptTrie" : "0x68a76da609c8a041bc9ff3db5621f335e4c4cea262ac766e228d5d067acf6899",
@@ -513,10 +189,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0472826fea98fba03420ce35795e1324e55e54e65136eba530f129cfa30ccad12a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa067a177567a927f06989299b355afd5417a98a9a1532e7f018598f7c32433775da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a068a76da609c8a041bc9ff3db5621f335e4c4cea262ac766e228d5d067acf6899b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a07e1a19f876641ff3be099165ec5de5c101c119b717b586f7b9cc79c6aa867c6288ea43d13c46f437d7f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0472826fea98fba03420ce35795e1324e55e54e65136eba530f129cfa30ccad12a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa067a177567a927f06989299b355afd5417a98a9a1532e7f018598f7c32433775da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a068a76da609c8a041bc9ff3db5621f335e4c4cea262ac766e228d5d067acf6899b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a064104fa8051a284ce16743679e573396f4760f21d591e08888bf52efc3bc0b1488814aafe57ea3f856f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -550,7 +226,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069d1465af200da8840c0d59c0e0cb3d5ae6172a73799a034a824e9888c89a618a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x32afddd924bff81fdd20f81de471f30b0469f0fc9165db6ff07bc8c46918575d",
+        "lastblockhash" : "0x983752cc85fac65822553984ac4531a0fec82188c101aed8f2295a31b2552270",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -633,167 +309,5 @@
                 }
             }
         }
-    },
-    "callcodecallcodecall_110_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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_110_d0g0v0Filler.json",
-            "sourceHash" : "cb9b6feb4929a40b20955487ef3a375837c85b235fa067c5d22224b5f3be1efb"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0464d3",
-                    "hash" : "0x44b1144bd94106f8f41a602bb597636336ab579945950b0af0dd29ae7a437273",
-                    "mixHash" : "0x4d6da188eb4aaf1ab19a1ce2bf89838720d7ad2dcdfa1733216c929e1d5d2abd",
-                    "nonce" : "0xb1a4ba6d9466c3bc",
-                    "number" : "0x01",
-                    "parentHash" : "0x472826fea98fba03420ce35795e1324e55e54e65136eba530f129cfa30ccad12",
-                    "receiptTrie" : "0xd917d2d23e342cc19e8ad0a38b03bf1ffe6f37c02782c0e9aba26fc3b8386d8e",
-                    "stateRoot" : "0x745f87e034f21c41a714fd963ee807783879da70d989548823c971e6d2a8d11d",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0472826fea98fba03420ce35795e1324e55e54e65136eba530f129cfa30ccad12a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0745f87e034f21c41a714fd963ee807783879da70d989548823c971e6d2a8d11da05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d917d2d23e342cc19e8ad0a38b03bf1ffe6f37c02782c0e9aba26fc3b8386d8eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830464d38203e880a04d6da188eb4aaf1ab19a1ce2bf89838720d7ad2dcdfa1733216c929e1d5d2abd88b1a4ba6d9466c3bcf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x472826fea98fba03420ce35795e1324e55e54e65136eba530f129cfa30ccad12",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x69d1465af200da8840c0d59c0e0cb3d5ae6172a73799a034a824e9888c89a618",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa069d1465af200da8840c0d59c0e0cb3d5ae6172a73799a034a824e9888c89a618a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x44b1144bd94106f8f41a602bb597636336ab579945950b0af0dd29ae7a437273",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x014a" : "0x1000000000000000000000000000000000000000",
-                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x0150" : "0x40",
-                    "0x0152" : "0x26",
-                    "0x0154" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01",
-                    "0x04" : "0x1000000000000000000000000000000000000000",
-                    "0x05" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x06" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x07" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f460015533600555",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060017310000000000000000000000000000000000000036203d090f260025533600655",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f864d3",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75f9b2d",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f460015533600555",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600060017310000000000000000000000000000000000000036203d090f260025533600655",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0.json
index 1dbad87d5..db6e070bc 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcodecall_ABCB_RECURSIVE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "924f88c7304cf242bed44093cf2fb06506c4b4651f5495dc9e333b3fdebe1ddd"
+            "sourceHash" : "cadc7beff61e1c4d6026325d032208178c1de6a93ec94362536b3e40a1642919"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab78",
-                    "hash" : "0x3a63ec101d8e1e04f728d62016312c7626da7e14af45e985c06b101da75d683f",
-                    "mixHash" : "0x16f037c3ed6ccef9a41a97d4e1f36e2d7f2e252a13a0dfedc36090452dcd43dd",
-                    "nonce" : "0xa744d487e5043f17",
+                    "hash" : "0x1732f9960533fa1d4d1624a917d414dc42415f9ed215ae5faa90d9c2f9b06427",
+                    "mixHash" : "0xb3b557ff4f178f562d1e57fb2cc9130e24eb9f2d0698d5b5a49033f15e1678e2",
+                    "nonce" : "0x92c70765dcaa4191",
                     "number" : "0x01",
                     "parentHash" : "0x5ac64f8d9bf9e2e7a5cea8d0c0e1d3949bedd0805607ea7b4803c803dce1a2a4",
                     "receiptTrie" : "0x29a19a0aaaab34a36ad92b7ff6b4e7ff702697c39fe7cf47ee0576931eba0bc9",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a05ac64f8d9bf9e2e7a5cea8d0c0e1d3949bedd0805607ea7b4803c803dce1a2a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0be3f46f161922d22647fe291ffb462f65461aad78e924e34aa93fe8dca6af1bca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a029a19a0aaaab34a36ad92b7ff6b4e7ff702697c39fe7cf47ee0576931eba0bc9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab788203e880a016f037c3ed6ccef9a41a97d4e1f36e2d7f2e252a13a0dfedc36090452dcd43dd88a744d487e5043f17f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a05ac64f8d9bf9e2e7a5cea8d0c0e1d3949bedd0805607ea7b4803c803dce1a2a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0be3f46f161922d22647fe291ffb462f65461aad78e924e34aa93fe8dca6af1bca06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a029a19a0aaaab34a36ad92b7ff6b4e7ff702697c39fe7cf47ee0576931eba0bc9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab788203e880a0b3b557ff4f178f562d1e57fb2cc9130e24eb9f2d0698d5b5a49033f15e1678e28892c70765dcaa4191f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c9f69a2d4c54a3cabc353b5387fdd774eb5444ec98aa62cf437b1872a098914a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3a63ec101d8e1e04f728d62016312c7626da7e14af45e985c06b101da75d683f",
+        "lastblockhash" : "0x1732f9960533fa1d4d1624a917d414dc42415f9ed215ae5faa90d9c2f9b06427",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -136,287 +136,13 @@
             }
         }
     },
-    "callcodecallcodecall_ABCB_RECURSIVE_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "924f88c7304cf242bed44093cf2fb06506c4b4651f5495dc9e333b3fdebe1ddd"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08ab78",
-                    "hash" : "0x662d43f46cc465a2b2d26c4164667957627c26771f65121eb073935cc7aac9f2",
-                    "mixHash" : "0xbbda4cff14d665a84e58d020375a6bfef7db2d578a094dcca3b349b606f07ed1",
-                    "nonce" : "0xb9db9b7ae8aa92a8",
-                    "number" : "0x01",
-                    "parentHash" : "0x5ac64f8d9bf9e2e7a5cea8d0c0e1d3949bedd0805607ea7b4803c803dce1a2a4",
-                    "receiptTrie" : "0x8106b3ce84f48e42d46ebea28b3bb76dee21e115744de0aef183357a846574a9",
-                    "stateRoot" : "0xb21cd604f256e23d925f4c74f3d12a2a598a7af469b2c4d64c5a2912c3cac22d",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f9a05ac64f8d9bf9e2e7a5cea8d0c0e1d3949bedd0805607ea7b4803c803dce1a2a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b21cd604f256e23d925f4c74f3d12a2a598a7af469b2c4d64c5a2912c3cac22da06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a08106b3ce84f48e42d46ebea28b3bb76dee21e115744de0aef183357a846574a9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab788203e880a0bbda4cff14d665a84e58d020375a6bfef7db2d578a094dcca3b349b606f07ed188b9db9b7ae8aa92a8f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x01c9c380",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
-                        "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0xb2d05e00",
-            "gasUsed" : "0x00",
-            "hash" : "0x5ac64f8d9bf9e2e7a5cea8d0c0e1d3949bedd0805607ea7b4803c803dce1a2a4",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x6c9f69a2d4c54a3cabc353b5387fdd774eb5444ec98aa62cf437b1872a098914",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c9f69a2d4c54a3cabc353b5387fdd774eb5444ec98aa62cf437b1872a098914a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x662d43f46cc465a2b2d26c4164667957627c26771f65121eb073935cc7aac9f2",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000163017d7840f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620f4240f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fcab78",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5488",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000163017d7840f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620f4240f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcodecall_ABCB_RECURSIVE_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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "924f88c7304cf242bed44093cf2fb06506c4b4651f5495dc9e333b3fdebe1ddd"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08ab78",
-                    "hash" : "0x730a69561c60eab6962ac00ee09820736b5899fccdb14dafad2a1cd189ea3be8",
-                    "mixHash" : "0xa8151a1fc7e8df37bab7f4a5e0339719d879271368a710f5595916417f00b547",
-                    "nonce" : "0x64ca1b16deeff099",
-                    "number" : "0x01",
-                    "parentHash" : "0x5ac64f8d9bf9e2e7a5cea8d0c0e1d3949bedd0805607ea7b4803c803dce1a2a4",
-                    "receiptTrie" : "0x8106b3ce84f48e42d46ebea28b3bb76dee21e115744de0aef183357a846574a9",
-                    "stateRoot" : "0xb21cd604f256e23d925f4c74f3d12a2a598a7af469b2c4d64c5a2912c3cac22d",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f9a05ac64f8d9bf9e2e7a5cea8d0c0e1d3949bedd0805607ea7b4803c803dce1a2a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b21cd604f256e23d925f4c74f3d12a2a598a7af469b2c4d64c5a2912c3cac22da06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a08106b3ce84f48e42d46ebea28b3bb76dee21e115744de0aef183357a846574a9b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab788203e880a0a8151a1fc7e8df37bab7f4a5e0339719d879271368a710f5595916417f00b5478864ca1b16deeff099f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x01c9c380",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
-                        "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0xb2d05e00",
-            "gasUsed" : "0x00",
-            "hash" : "0x5ac64f8d9bf9e2e7a5cea8d0c0e1d3949bedd0805607ea7b4803c803dce1a2a4",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x6c9f69a2d4c54a3cabc353b5387fdd774eb5444ec98aa62cf437b1872a098914",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c9f69a2d4c54a3cabc353b5387fdd774eb5444ec98aa62cf437b1872a098914a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x730a69561c60eab6962ac00ee09820736b5899fccdb14dafad2a1cd189ea3be8",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000163017d7840f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620f4240f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fcab78",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b5488",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000163017d7840f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620f4240f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x604060006040600060007310000000000000000000000000000000000000016207a120f2600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcodecall_ABCB_RECURSIVE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "924f88c7304cf242bed44093cf2fb06506c4b4651f5495dc9e333b3fdebe1ddd"
+            "sourceHash" : "cadc7beff61e1c4d6026325d032208178c1de6a93ec94362536b3e40a1642919"
         },
         "blocks" : [
             {
@@ -427,9 +153,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x01c9c380",
-                    "hash" : "0x887240932cf67e7d43d1cdbc02eacc6d42bc7f1364bba55af1286161312a4642",
-                    "mixHash" : "0x9c81e97b714fda1c93ba296f45a63a7027be5534ece90ec3236d5299d7dd5792",
-                    "nonce" : "0x51d699ddf19a85bc",
+                    "hash" : "0x9c656cbbd1d21c7d642c8989205fca2870d9b5160aac63c403b75df9d6ed8d1b",
+                    "mixHash" : "0xf366cd261b883e5e62e4b4b2659e217353666353a71d5718f11f5c1bfbc85b50",
+                    "nonce" : "0x400ac76fc7ca46f6",
                     "number" : "0x01",
                     "parentHash" : "0x5ac64f8d9bf9e2e7a5cea8d0c0e1d3949bedd0805607ea7b4803c803dce1a2a4",
                     "receiptTrie" : "0x6ea705a2f9f04eb0355618ecebe28466d12838bd3771550a56ca8e5d1345c91e",
@@ -438,10 +164,10 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa05ac64f8d9bf9e2e7a5cea8d0c0e1d3949bedd0805607ea7b4803c803dce1a2a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043eaae55c69b5e5e7eb76ad7c180df17aba41e88d1043bbe92a7f95572b25c36a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a06ea705a2f9f04eb0355618ecebe28466d12838bd3771550a56ca8e5d1345c91eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008401c9c3808203e880a09c81e97b714fda1c93ba296f45a63a7027be5534ece90ec3236d5299d7dd57928851d699ddf19a85bcf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90263f901faa05ac64f8d9bf9e2e7a5cea8d0c0e1d3949bedd0805607ea7b4803c803dce1a2a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa043eaae55c69b5e5e7eb76ad7c180df17aba41e88d1043bbe92a7f95572b25c36a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a06ea705a2f9f04eb0355618ecebe28466d12838bd3771550a56ca8e5d1345c91eb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008401c9c3808203e880a0f366cd261b883e5e62e4b4b2659e217353666353a71d5718f11f5c1bfbc85b5088400ac76fc7ca46f6f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -475,7 +201,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c9f69a2d4c54a3cabc353b5387fdd774eb5444ec98aa62cf437b1872a098914a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x887240932cf67e7d43d1cdbc02eacc6d42bc7f1364bba55af1286161312a4642",
+        "lastblockhash" : "0x9c656cbbd1d21c7d642c8989205fca2870d9b5160aac63c403b75df9d6ed8d1b",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -548,10 +274,10 @@
     "callcodecallcodecall_ABCB_RECURSIVE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecall_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "924f88c7304cf242bed44093cf2fb06506c4b4651f5495dc9e333b3fdebe1ddd"
+            "sourceHash" : "cadc7beff61e1c4d6026325d032208178c1de6a93ec94362536b3e40a1642919"
         },
         "blocks" : [
             {
@@ -562,9 +288,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3bc",
-                    "hash" : "0x330fc70c928400aae17db65ecda0a6e8c49a6a0a28d3d919cbd0689eef556e02",
-                    "mixHash" : "0x7faede20b805bd59bf7f83b25341ff031fc0d3cd7849adc82e70db06f2b26d02",
-                    "nonce" : "0x6395959f7ea7e6c3",
+                    "hash" : "0x47e5c2ca2f01ecc599fe555fab0a9359f6e6574cf5d7c2d6db2e877ffe9bc4c6",
+                    "mixHash" : "0xb43a2b75e4ea04ecfc32dc08b6f6f01d351a6ac8183a73d82d8a21f9c4851196",
+                    "nonce" : "0xa8d315bd2ea11579",
                     "number" : "0x01",
                     "parentHash" : "0x5ac64f8d9bf9e2e7a5cea8d0c0e1d3949bedd0805607ea7b4803c803dce1a2a4",
                     "receiptTrie" : "0xd39cc6f2f717077ced0d6e9c889ae182bbd63d948ce1abd707259a8cacbda399",
@@ -573,10 +299,10 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a05ac64f8d9bf9e2e7a5cea8d0c0e1d3949bedd0805607ea7b4803c803dce1a2a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae0c85019e209cae1f511ba1fe38b2d2ac056b55fd57c3f4c814be4c1581d6bda06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0d39cc6f2f717077ced0d6e9c889ae182bbd63d948ce1abd707259a8cacbda399b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3bc8203e880a07faede20b805bd59bf7f83b25341ff031fc0d3cd7849adc82e70db06f2b26d02886395959f7ea7e6c3f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a05ac64f8d9bf9e2e7a5cea8d0c0e1d3949bedd0805607ea7b4803c803dce1a2a4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae0c85019e209cae1f511ba1fe38b2d2ac056b55fd57c3f4c814be4c1581d6bda06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0d39cc6f2f717077ced0d6e9c889ae182bbd63d948ce1abd707259a8cacbda399b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3bc8203e880a0b43a2b75e4ea04ecfc32dc08b6f6f01d351a6ac8183a73d82d8a21f9c485119688a8d315bd2ea11579f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -610,7 +336,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06c9f69a2d4c54a3cabc353b5387fdd774eb5444ec98aa62cf437b1872a098914a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x330fc70c928400aae17db65ecda0a6e8c49a6a0a28d3d919cbd0689eef556e02",
+        "lastblockhash" : "0x47e5c2ca2f01ecc599fe555fab0a9359f6e6574cf5d7c2d6db2e877ffe9bc4c6",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGE_d0g0v0.json
index 664734c78..060a25e84 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGE_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "0ab4e221d1656d2b94fdd788fe2199f24903c03a16b3711b02e0408ea742fcb3"
+            "sourceHash" : "eb7e00899c0bf7bf5a35a02cc61473eb8ec4778808441216e4fc422bb8a20ac3"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x015889",
-                    "hash" : "0x7545122c0b72862669ddade9ccd597058c7cd7206eb82d99b3dede0bf4a98067",
-                    "mixHash" : "0x4d9650198fd9c5b42af57bb33a02f90847d2e3f3615085d63c2ad77581c340c9",
-                    "nonce" : "0x97c73096664e0a2a",
+                    "hash" : "0x6e7728cbe1e3816b766370e6bd909fcb2cc21a6961fabb0ef93604f354a7c30a",
+                    "mixHash" : "0x35c0e2535033755582ec8da94ff97d7d4cf987bc136302a8dc927b69c723d771",
+                    "nonce" : "0xb14debf84fe79fcf",
                     "number" : "0x01",
                     "parentHash" : "0x96678f6369888681b5ba6186c2ba339a568798c4c3e620d5e9ce3a25b922b1fb",
                     "receiptTrie" : "0x9d36d5e47c9cddd8b4d159df474729245e2bf92496f8ed5b3b1620044f11d68d",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a096678f6369888681b5ba6186c2ba339a568798c4c3e620d5e9ce3a25b922b1fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b56761a89423af9278096ca1ebe3c2a47bd12dcd53230fd5989ad8ef4ff88f7ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09d36d5e47c9cddd8b4d159df474729245e2bf92496f8ed5b3b1620044f11d68db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158898203e880a04d9650198fd9c5b42af57bb33a02f90847d2e3f3615085d63c2ad77581c340c98897c73096664e0a2af862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a096678f6369888681b5ba6186c2ba339a568798c4c3e620d5e9ce3a25b922b1fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b56761a89423af9278096ca1ebe3c2a47bd12dcd53230fd5989ad8ef4ff88f7ca0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea09d36d5e47c9cddd8b4d159df474729245e2bf92496f8ed5b3b1620044f11d68db901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158898203e880a035c0e2535033755582ec8da94ff97d7d4cf987bc136302a8dc927b69c723d77188b14debf84fe79fcff862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5bce9f67c861bfab38f7cce772fb0aa4ee0da3a4efa96b4835f7115ef03d2fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7545122c0b72862669ddade9ccd597058c7cd7206eb82d99b3dede0bf4a98067",
+        "lastblockhash" : "0x6e7728cbe1e3816b766370e6bd909fcb2cc21a6961fabb0ef93604f354a7c30a",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -150,315 +150,13 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_OOGE_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "0ab4e221d1656d2b94fdd788fe2199f24903c03a16b3711b02e0408ea742fcb3"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x015889",
-                    "hash" : "0x628446c432b0360c0150cb31d5037b1b498583be8f3786adaf5177e4fd9f1917",
-                    "mixHash" : "0x95fc2e6de7c0bd098b4814ad0a9fabe9426e7c7904170ff3f1cb31fc3f100a33",
-                    "nonce" : "0xd9559870be9a4b6b",
-                    "number" : "0x01",
-                    "parentHash" : "0x96678f6369888681b5ba6186c2ba339a568798c4c3e620d5e9ce3a25b922b1fb",
-                    "receiptTrie" : "0x0895fc54becc0496de916c0dd3c128ad0e91bebec25057a2111fa86c1e99a46a",
-                    "stateRoot" : "0xed246f7fd4b9e3b2a34c3146b7e05a4e204c458482a6907a6995c8b54272b9cd",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a096678f6369888681b5ba6186c2ba339a568798c4c3e620d5e9ce3a25b922b1fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed246f7fd4b9e3b2a34c3146b7e05a4e204c458482a6907a6995c8b54272b9cda0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00895fc54becc0496de916c0dd3c128ad0e91bebec25057a2111fa86c1e99a46ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158898203e880a095fc2e6de7c0bd098b4814ad0a9fabe9426e7c7904170ff3f1cb31fc3f100a3388d9559870be9a4b6bf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x96678f6369888681b5ba6186c2ba339a568798c4c3e620d5e9ce3a25b922b1fb",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe5bce9f67c861bfab38f7cce772fb0aa4ee0da3a4efa96b4835f7115ef03d2fe",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5bce9f67c861bfab38f7cce772fb0aa4ee0da3a4efa96b4835f7115ef03d2fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x628446c432b0360c0150cb31d5037b1b498583be8f3786adaf5177e4fd9f1917",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619d3af4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55889",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762a777",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619d3af4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcodecallcode_111_OOGE_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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "0ab4e221d1656d2b94fdd788fe2199f24903c03a16b3711b02e0408ea742fcb3"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x015889",
-                    "hash" : "0x2e228d08284be993c552c12c7c568e7c4578120d03e74b86a28fe719158ecbc2",
-                    "mixHash" : "0xcfd24d7581eaeb2d215e9a19faade1155055e144f158db48e09a64ae27e0fd9c",
-                    "nonce" : "0xdf8fd45d9f0e2fc0",
-                    "number" : "0x01",
-                    "parentHash" : "0x96678f6369888681b5ba6186c2ba339a568798c4c3e620d5e9ce3a25b922b1fb",
-                    "receiptTrie" : "0x0895fc54becc0496de916c0dd3c128ad0e91bebec25057a2111fa86c1e99a46a",
-                    "stateRoot" : "0xed246f7fd4b9e3b2a34c3146b7e05a4e204c458482a6907a6995c8b54272b9cd",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a096678f6369888681b5ba6186c2ba339a568798c4c3e620d5e9ce3a25b922b1fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ed246f7fd4b9e3b2a34c3146b7e05a4e204c458482a6907a6995c8b54272b9cda0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea00895fc54becc0496de916c0dd3c128ad0e91bebec25057a2111fa86c1e99a46ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830158898203e880a0cfd24d7581eaeb2d215e9a19faade1155055e144f158db48e09a64ae27e0fd9c88df8fd45d9f0e2fc0f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x96678f6369888681b5ba6186c2ba339a568798c4c3e620d5e9ce3a25b922b1fb",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe5bce9f67c861bfab38f7cce772fb0aa4ee0da3a4efa96b4835f7115ef03d2fe",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5bce9f67c861bfab38f7cce772fb0aa4ee0da3a4efa96b4835f7115ef03d2fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2e228d08284be993c552c12c7c568e7c4578120d03e74b86a28fe719158ecbc2",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619d3af4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f55889",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762a777",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619d3af4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcodecallcode_111_OOGE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "0ab4e221d1656d2b94fdd788fe2199f24903c03a16b3711b02e0408ea742fcb3"
+            "sourceHash" : "eb7e00899c0bf7bf5a35a02cc61473eb8ec4778808441216e4fc422bb8a20ac3"
         },
         "blocks" : [
             {
@@ -469,9 +167,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "0xf1364961045a435320ad286615383776bcb4d5a2e315d2792d184d2bf4067d58",
-                    "mixHash" : "0x4d98997864e82076f9fc4bab214bd2bade8c123732fd8bc6a227a5aea65d7b4d",
-                    "nonce" : "0x2e4432085149edc9",
+                    "hash" : "0x2efaedcea6e8c4874a013ee610ee29a1da17e66fcf19140f2920bd2723d877e4",
+                    "mixHash" : "0x6ea2ab312d3ea4f76dd2c49665fb4a3b135fe13a573622795441d117c1c38634",
+                    "nonce" : "0xae012b2f34c03317",
                     "number" : "0x01",
                     "parentHash" : "0x96678f6369888681b5ba6186c2ba339a568798c4c3e620d5e9ce3a25b922b1fb",
                     "receiptTrie" : "0xd81be509bcd2e12928081bc0bcde9c5ef761934e1652f16e56e181cd39591b8b",
@@ -480,10 +178,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a096678f6369888681b5ba6186c2ba339a568798c4c3e620d5e9ce3a25b922b1fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025b8dd287c9614e28ca1cee01b234099d299be16f4bcfbcb0670a4171731b660a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0d81be509bcd2e12928081bc0bcde9c5ef761934e1652f16e56e181cd39591b8bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a04d98997864e82076f9fc4bab214bd2bade8c123732fd8bc6a227a5aea65d7b4d882e4432085149edc9f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a096678f6369888681b5ba6186c2ba339a568798c4c3e620d5e9ce3a25b922b1fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025b8dd287c9614e28ca1cee01b234099d299be16f4bcfbcb0670a4171731b660a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0d81be509bcd2e12928081bc0bcde9c5ef761934e1652f16e56e181cd39591b8bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a06ea2ab312d3ea4f76dd2c49665fb4a3b135fe13a573622795441d117c1c3863488ae012b2f34c03317f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -517,7 +215,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5bce9f67c861bfab38f7cce772fb0aa4ee0da3a4efa96b4835f7115ef03d2fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf1364961045a435320ad286615383776bcb4d5a2e315d2792d184d2bf4067d58",
+        "lastblockhash" : "0x2efaedcea6e8c4874a013ee610ee29a1da17e66fcf19140f2920bd2723d877e4",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -600,156 +298,5 @@
                 }
             }
         }
-    },
-    "callcodecallcodecallcode_111_OOGE_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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGE_d0g0v0Filler.json",
-            "sourceHash" : "0ab4e221d1656d2b94fdd788fe2199f24903c03a16b3711b02e0408ea742fcb3"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150cd",
-                    "hash" : "0xd1089467525aea2c16cc46e5e8fb70b7ebd447b5c8621bffcb7a2d74bc1a8f24",
-                    "mixHash" : "0x5229cc3c38afbb5c3fcb95b79b507674f909c3ae630b10c6014a5675da46845b",
-                    "nonce" : "0x9a9bd4676d9e274c",
-                    "number" : "0x01",
-                    "parentHash" : "0x96678f6369888681b5ba6186c2ba339a568798c4c3e620d5e9ce3a25b922b1fb",
-                    "receiptTrie" : "0xe04a14e639e758ebb9fb71adc04dddbfecdae2870fdb1fd3dc8917a17fc6afce",
-                    "stateRoot" : "0x7bbb63f2b38a10058a1ede98a45075c051b7db823104ee82fe7d96ce2854309a",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a096678f6369888681b5ba6186c2ba339a568798c4c3e620d5e9ce3a25b922b1fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07bbb63f2b38a10058a1ede98a45075c051b7db823104ee82fe7d96ce2854309aa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e04a14e639e758ebb9fb71adc04dddbfecdae2870fdb1fd3dc8917a17fc6afceb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150cd8203e880a05229cc3c38afbb5c3fcb95b79b507674f909c3ae630b10c6014a5675da46845b889a9bd4676d9e274cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x96678f6369888681b5ba6186c2ba339a568798c4c3e620d5e9ce3a25b922b1fb",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe5bce9f67c861bfab38f7cce772fb0aa4ee0da3a4efa96b4835f7115ef03d2fe",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e5bce9f67c861bfab38f7cce772fb0aa4ee0da3a4efa96b4835f7115ef03d2fea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd1089467525aea2c16cc46e5e8fb70b7ebd447b5c8621bffcb7a2d74bc1a8f24",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619d3af4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550cd",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af33",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619d3af4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x60016003556001600352",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMAfter_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMAfter_d0g0v0.json
index 92c7f7074..8d102c9d6 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMAfter_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "a96597485af471f138b6abafdbf73c9cd1f0bc148619a30163d1edc66819c66c"
+            "sourceHash" : "bc36d990502572c42444d9356d11351f1836649caa0cdd522216dceed0e3957f"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x01560b",
-                    "hash" : "0x926ec01109e56987dab89b5302c10c219fe891f1830b545b2a93bbdee28f0553",
-                    "mixHash" : "0xd8ffcf2d6d86ab887deebc9f98d1c3e5c9a800ee623cddfcea580bd40c0de19e",
-                    "nonce" : "0xbf92ae45dea2f511",
+                    "hash" : "0xa98781c945f1336506b645f1d9bc6af98f91865e4aaa036b8f873cf5fc47e340",
+                    "mixHash" : "0x51e4d2528383290d20aea8234ba3c5d05a25689eb06eb86e85c9ee806d520f79",
+                    "nonce" : "0x7c571d9706d352aa",
                     "number" : "0x01",
                     "parentHash" : "0x262b7fd18f289c7ceab3ddddabf0392a0a3ac9e40ffc525c22dfb481151855e4",
                     "receiptTrie" : "0x1926df3be5c4905a6dff93b7431c5c79da9a1aab9889f3fee59e1296ef7a6bd9",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0262b7fd18f289c7ceab3ddddabf0392a0a3ac9e40ffc525c22dfb481151855e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e368cc98f890e8a3cc121f8a7dc7dec8a1e4388e425dc56dac927d328f356eaa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea01926df3be5c4905a6dff93b7431c5c79da9a1aab9889f3fee59e1296ef7a6bd9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301560b8203e880a0d8ffcf2d6d86ab887deebc9f98d1c3e5c9a800ee623cddfcea580bd40c0de19e88bf92ae45dea2f511f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0262b7fd18f289c7ceab3ddddabf0392a0a3ac9e40ffc525c22dfb481151855e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00e368cc98f890e8a3cc121f8a7dc7dec8a1e4388e425dc56dac927d328f356eaa0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea01926df3be5c4905a6dff93b7431c5c79da9a1aab9889f3fee59e1296ef7a6bd9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301560b8203e880a051e4d2528383290d20aea8234ba3c5d05a25689eb06eb86e85c9ee806d520f79887c571d9706d352aaf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a620ff51bda7f6ba28747f1155da8e9462da1c6f9d3d0eb33637881639984f0aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x926ec01109e56987dab89b5302c10c219fe891f1830b545b2a93bbdee28f0553",
+        "lastblockhash" : "0xa98781c945f1336506b645f1d9bc6af98f91865e4aaa036b8f873cf5fc47e340",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -149,462 +149,13 @@
             }
         }
     },
-    "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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "a96597485af471f138b6abafdbf73c9cd1f0bc148619a30163d1edc66819c66c"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x01560b",
-                    "hash" : "0x2422b6d2663ea27c108542f353ed2716bf807d903203d63e57eadcaac5cd1b76",
-                    "mixHash" : "0x4fcee6bec3001ecb924eb3e56bab9ba04dda50ea5c6532b9a1b4776e39e4592d",
-                    "nonce" : "0x7bc9f8838f0b5c49",
-                    "number" : "0x01",
-                    "parentHash" : "0x262b7fd18f289c7ceab3ddddabf0392a0a3ac9e40ffc525c22dfb481151855e4",
-                    "receiptTrie" : "0x5db0c4a2708aba30824d95a97638a0cdc1cc932b033879315f14e1a66d4f5f69",
-                    "stateRoot" : "0xdd3096fd913fee9e9e32eb6245614fc74ea9ecba135097023185aa53d21f019e",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0262b7fd18f289c7ceab3ddddabf0392a0a3ac9e40ffc525c22dfb481151855e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd3096fd913fee9e9e32eb6245614fc74ea9ecba135097023185aa53d21f019ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05db0c4a2708aba30824d95a97638a0cdc1cc932b033879315f14e1a66d4f5f69b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301560b8203e880a04fcee6bec3001ecb924eb3e56bab9ba04dda50ea5c6532b9a1b4776e39e4592d887bc9f8838f0b5c49f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x262b7fd18f289c7ceab3ddddabf0392a0a3ac9e40ffc525c22dfb481151855e4",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xa620ff51bda7f6ba28747f1155da8e9462da1c6f9d3d0eb33637881639984f0a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a620ff51bda7f6ba28747f1155da8e9462da1c6f9d3d0eb33637881639984f0aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2422b6d2663ea27c108542f353ed2716bf807d903203d63e57eadcaac5cd1b76",
-        "network" : "EIP150",
-        "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_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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "a96597485af471f138b6abafdbf73c9cd1f0bc148619a30163d1edc66819c66c"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x01560b",
-                    "hash" : "0xb2e78c5042069c8259aa9b6a1a627eb1ca3a98bc6cfaa5f3070d28692013faf2",
-                    "mixHash" : "0xf99c758b70d6f658da1c49348103878b1038d29997a3bb43981d10d821b2378f",
-                    "nonce" : "0xa26ba68ec8697d70",
-                    "number" : "0x01",
-                    "parentHash" : "0x262b7fd18f289c7ceab3ddddabf0392a0a3ac9e40ffc525c22dfb481151855e4",
-                    "receiptTrie" : "0x5db0c4a2708aba30824d95a97638a0cdc1cc932b033879315f14e1a66d4f5f69",
-                    "stateRoot" : "0xdd3096fd913fee9e9e32eb6245614fc74ea9ecba135097023185aa53d21f019e",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0262b7fd18f289c7ceab3ddddabf0392a0a3ac9e40ffc525c22dfb481151855e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dd3096fd913fee9e9e32eb6245614fc74ea9ecba135097023185aa53d21f019ea0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea05db0c4a2708aba30824d95a97638a0cdc1cc932b033879315f14e1a66d4f5f69b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808301560b8203e880a0f99c758b70d6f658da1c49348103878b1038d29997a3bb43981d10d821b2378f88a26ba68ec8697d70f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x262b7fd18f289c7ceab3ddddabf0392a0a3ac9e40ffc525c22dfb481151855e4",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xa620ff51bda7f6ba28747f1155da8e9462da1c6f9d3d0eb33637881639984f0a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a620ff51bda7f6ba28747f1155da8e9462da1c6f9d3d0eb33637881639984f0aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb2e78c5042069c8259aa9b6a1a627eb1ca3a98bc6cfaa5f3070d28692013faf2",
-        "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_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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "a96597485af471f138b6abafdbf73c9cd1f0bc148619a30163d1edc66819c66c"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x029fe0",
-                    "hash" : "0xa1f4362625a1f6b2618b034b8ae9915e7eec61bdd6e00cec615485af829b6219",
-                    "mixHash" : "0x956e722afb173e63871dd2c6e6e2d8d731cc83b4d81ea7de7321cc7eaf30dd1c",
-                    "nonce" : "0x6aee5331390731d5",
-                    "number" : "0x01",
-                    "parentHash" : "0x262b7fd18f289c7ceab3ddddabf0392a0a3ac9e40ffc525c22dfb481151855e4",
-                    "receiptTrie" : "0xffebc7dd796b61628611afbc88c2fe5ebf24bf890563437630c3f72ea1eee5ee",
-                    "stateRoot" : "0x3e403265ce4748cd8e8a74172ca0a1f41b4eab12b7035cc98a16e2b92ca561cb",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0262b7fd18f289c7ceab3ddddabf0392a0a3ac9e40ffc525c22dfb481151855e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03e403265ce4748cd8e8a74172ca0a1f41b4eab12b7035cc98a16e2b92ca561cba0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0ffebc7dd796b61628611afbc88c2fe5ebf24bf890563437630c3f72ea1eee5eeb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0956e722afb173e63871dd2c6e6e2d8d731cc83b4d81ea7de7321cc7eaf30dd1c886aee5331390731d5f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x262b7fd18f289c7ceab3ddddabf0392a0a3ac9e40ffc525c22dfb481151855e4",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xa620ff51bda7f6ba28747f1155da8e9462da1c6f9d3d0eb33637881639984f0a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a620ff51bda7f6ba28747f1155da8e9462da1c6f9d3d0eb33637881639984f0aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa1f4362625a1f6b2618b034b8ae9915e7eec61bdd6e00cec615485af829b6219",
-        "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_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMAfter_d0g0v0Filler.json",
-            "sourceHash" : "a96597485af471f138b6abafdbf73c9cd1f0bc148619a30163d1edc66819c66c"
+            "sourceHash" : "bc36d990502572c42444d9356d11351f1836649caa0cdd522216dceed0e3957f"
         },
         "blocks" : [
             {
@@ -615,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0150bf",
-                    "hash" : "0xde53da3b90ac236a4278cf821828c20fd8dd23c09ef6741a5cd30686044235e7",
-                    "mixHash" : "0xfd24b2c4dcde69135f1accad728a794c2e4e8d68473b444e76b84cf74d4cd913",
-                    "nonce" : "0x2602ae301b94ed79",
+                    "hash" : "0x0ea15f8e8d3ee9cd464012576da20c082d9a27517912e0111c975f3bd875f2cb",
+                    "mixHash" : "0x32e431efe483961ec2138598cfda0395840aa52eda2a1889ea41b7cabd000253",
+                    "nonce" : "0xf24887803c1d5fb9",
                     "number" : "0x01",
                     "parentHash" : "0x262b7fd18f289c7ceab3ddddabf0392a0a3ac9e40ffc525c22dfb481151855e4",
                     "receiptTrie" : "0x8c08c62842dd89433ba3e326a0fc4d8df7ea0eb531f3268a85af0741e8b235ab",
@@ -626,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0262b7fd18f289c7ceab3ddddabf0392a0a3ac9e40ffc525c22dfb481151855e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03f99e0dd20d473276c121adfe85bb3120f9ec91130e3bd49532d1e2567d7c800a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08c08c62842dd89433ba3e326a0fc4d8df7ea0eb531f3268a85af0741e8b235abb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150bf8203e880a0fd24b2c4dcde69135f1accad728a794c2e4e8d68473b444e76b84cf74d4cd913882602ae301b94ed79f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a0262b7fd18f289c7ceab3ddddabf0392a0a3ac9e40ffc525c22dfb481151855e4a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03f99e0dd20d473276c121adfe85bb3120f9ec91130e3bd49532d1e2567d7c800a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea08c08c62842dd89433ba3e326a0fc4d8df7ea0eb531f3268a85af0741e8b235abb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150bf8203e880a032e431efe483961ec2138598cfda0395840aa52eda2a1889ea41b7cabd00025388f24887803c1d5fb9f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -663,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a620ff51bda7f6ba28747f1155da8e9462da1c6f9d3d0eb33637881639984f0aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xde53da3b90ac236a4278cf821828c20fd8dd23c09ef6741a5cd30686044235e7",
+        "lastblockhash" : "0x0ea15f8e8d3ee9cd464012576da20c082d9a27517912e0111c975f3bd875f2cb",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBefore_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBefore_d0g0v0.json
index 35724a4d8..89527a69d 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBefore_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBefore_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_OOGMBefore_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "8680229557d8d99031df51304f2780594a01747439f4d78217afcdb449be2409"
+            "sourceHash" : "c8e5f5cb689ca6666d1330b486c961b93f25d34f76fe971527368ffae4c1665a"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x0155ee",
-                    "hash" : "0x83edeabcd1a956ed1f571a45f7820ca9ae6f1e701cc5ce2af191de5f61b1bbd8",
-                    "mixHash" : "0x149481af33ccb10bbe4633d4d081e1640ca6e8f820ef64470ca4d28666310667",
-                    "nonce" : "0x17c8c4f002f36000",
+                    "hash" : "0x47c79ff03ff0481bbf74f47e14c9a42bad50280d0f67347d4b2d132a22929e69",
+                    "mixHash" : "0x5823e11d89b206c23a4fca6b69323e10067df1b4a561ca8e726018a95efd65bc",
+                    "nonce" : "0xc8eed9b8e0a5544c",
                     "number" : "0x01",
                     "parentHash" : "0x3b6502fa4206825f7a763c3d43657916aaa3e4bbd93bb006bc6f06793b42d872",
                     "receiptTrie" : "0xe264a72954db7d4731949ff3f09e34832ad1b0b9b6ea1d6e5d64b2fb4f8dd62b",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a03b6502fa4206825f7a763c3d43657916aaa3e4bbd93bb006bc6f06793b42d872a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09177bd727ef0d0e390b90e916d8b60d1cf4302b11eba5441ccb5cd91e209d8e6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e264a72954db7d4731949ff3f09e34832ad1b0b9b6ea1d6e5d64b2fb4f8dd62bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155ee8203e880a0149481af33ccb10bbe4633d4d081e1640ca6e8f820ef64470ca4d286663106678817c8c4f002f36000f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a03b6502fa4206825f7a763c3d43657916aaa3e4bbd93bb006bc6f06793b42d872a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09177bd727ef0d0e390b90e916d8b60d1cf4302b11eba5441ccb5cd91e209d8e6a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0e264a72954db7d4731949ff3f09e34832ad1b0b9b6ea1d6e5d64b2fb4f8dd62bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155ee8203e880a05823e11d89b206c23a4fca6b69323e10067df1b4a561ca8e726018a95efd65bc88c8eed9b8e0a5544cf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dba3496b5c1f15835bd074504aead3e013db64d216fd3da3a76c5340f52087f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x83edeabcd1a956ed1f571a45f7820ca9ae6f1e701cc5ce2af191de5f61b1bbd8",
+        "lastblockhash" : "0x47c79ff03ff0481bbf74f47e14c9a42bad50280d0f67347d4b2d132a22929e69",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -149,313 +149,13 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_OOGMBefore_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "8680229557d8d99031df51304f2780594a01747439f4d78217afcdb449be2409"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155ee",
-                    "hash" : "0xa35d7f4ba9c152fb2c6a8ea0f7bd08f10671ce2afd1d21c66d2c062e445baf55",
-                    "mixHash" : "0x4f3d9e957d7cfcba2cf68c02d6c75b58dde29ccca577019c32e6afe64955a92c",
-                    "nonce" : "0xda941b7f3e878dad",
-                    "number" : "0x01",
-                    "parentHash" : "0x3b6502fa4206825f7a763c3d43657916aaa3e4bbd93bb006bc6f06793b42d872",
-                    "receiptTrie" : "0x18f691da0578822b9915e39edd5b583299ca22a37b01483e9ef67f6a48f7d380",
-                    "stateRoot" : "0xdb36d2ed8451424f3b06e3da9f19b03a7ec128c37df965e213711347d02d9226",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a03b6502fa4206825f7a763c3d43657916aaa3e4bbd93bb006bc6f06793b42d872a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0db36d2ed8451424f3b06e3da9f19b03a7ec128c37df965e213711347d02d9226a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea018f691da0578822b9915e39edd5b583299ca22a37b01483e9ef67f6a48f7d380b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155ee8203e880a04f3d9e957d7cfcba2cf68c02d6c75b58dde29ccca577019c32e6afe64955a92c88da941b7f3e878dadf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x3b6502fa4206825f7a763c3d43657916aaa3e4bbd93bb006bc6f06793b42d872",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xdba3496b5c1f15835bd074504aead3e013db64d216fd3da3a76c5340f52087f0",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dba3496b5c1f15835bd074504aead3e013db64d216fd3da3a76c5340f52087f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa35d7f4ba9c152fb2c6a8ea0f7bd08f10671ce2afd1d21c66d2c062e445baf55",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555ee",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa12",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcodecallcode_111_OOGMBefore_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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "8680229557d8d99031df51304f2780594a01747439f4d78217afcdb449be2409"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0155ee",
-                    "hash" : "0x80b641008a59b61aaae886327e0c0f849c3bc509e15d6a9edefab7341051f1c0",
-                    "mixHash" : "0xc3b2db9a78dba793a3e2c21d8694e7214e0e9f978cdecdf95aa8a0c9c9586d8e",
-                    "nonce" : "0x3a612d9b3037bd22",
-                    "number" : "0x01",
-                    "parentHash" : "0x3b6502fa4206825f7a763c3d43657916aaa3e4bbd93bb006bc6f06793b42d872",
-                    "receiptTrie" : "0x18f691da0578822b9915e39edd5b583299ca22a37b01483e9ef67f6a48f7d380",
-                    "stateRoot" : "0xdb36d2ed8451424f3b06e3da9f19b03a7ec128c37df965e213711347d02d9226",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a03b6502fa4206825f7a763c3d43657916aaa3e4bbd93bb006bc6f06793b42d872a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0db36d2ed8451424f3b06e3da9f19b03a7ec128c37df965e213711347d02d9226a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea018f691da0578822b9915e39edd5b583299ca22a37b01483e9ef67f6a48f7d380b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830155ee8203e880a0c3b2db9a78dba793a3e2c21d8694e7214e0e9f978cdecdf95aa8a0c9c9586d8e883a612d9b3037bd22f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x3b6502fa4206825f7a763c3d43657916aaa3e4bbd93bb006bc6f06793b42d872",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xdba3496b5c1f15835bd074504aead3e013db64d216fd3da3a76c5340f52087f0",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dba3496b5c1f15835bd074504aead3e013db64d216fd3da3a76c5340f52087f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x80b641008a59b61aaae886327e0c0f849c3bc509e15d6a9edefab7341051f1c0",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f555ee",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762aa12",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcodecallcode_111_OOGMBefore_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "8680229557d8d99031df51304f2780594a01747439f4d78217afcdb449be2409"
+            "sourceHash" : "c8e5f5cb689ca6666d1330b486c961b93f25d34f76fe971527368ffae4c1665a"
         },
         "blocks" : [
             {
@@ -466,9 +166,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x029fe0",
-                    "hash" : "0x7949dfe42f139b6a2fdf60406246a097c9e0fcc0b76e2bd0ffcb85d2d9e9d962",
-                    "mixHash" : "0x9ea166c48b6222040ec5c8c87baf9192727a87a08da36c4eb31ea27c2e532414",
-                    "nonce" : "0x6b66d84fbc1d39fa",
+                    "hash" : "0x2e54b9d0aaf48b25e68f40e5835edc85844412fcf9f5b2c548e38a7e78680293",
+                    "mixHash" : "0xb318964d7309b0095ef04d4edf7c7bc951a5980f6bab8df3a95e72751fbdfa19",
+                    "nonce" : "0x62a29003106a2a53",
                     "number" : "0x01",
                     "parentHash" : "0x3b6502fa4206825f7a763c3d43657916aaa3e4bbd93bb006bc6f06793b42d872",
                     "receiptTrie" : "0xa7ab3e42c86c3a4e3beaa6bef49e0db69e4c96e98552eba5464c8be8e69afb26",
@@ -477,10 +177,10 @@
                     "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a03b6502fa4206825f7a763c3d43657916aaa3e4bbd93bb006bc6f06793b42d872a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e675220122be53d877a381aa64f607ad4d16ed52244f60c8fb542faeab77ec36a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a7ab3e42c86c3a4e3beaa6bef49e0db69e4c96e98552eba5464c8be8e69afb26b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a09ea166c48b6222040ec5c8c87baf9192727a87a08da36c4eb31ea27c2e532414886b66d84fbc1d39faf862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
+                "rlp" : "0xf90261f901f9a03b6502fa4206825f7a763c3d43657916aaa3e4bbd93bb006bc6f06793b42d872a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e675220122be53d877a381aa64f607ad4d16ed52244f60c8fb542faeab77ec36a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0a7ab3e42c86c3a4e3beaa6bef49e0db69e4c96e98552eba5464c8be8e69afb26b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083029fe08203e880a0b318964d7309b0095ef04d4edf7c7bc951a5980f6bab8df3a95e72751fbdfa198862a29003106a2a53f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x029fe0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -514,7 +214,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dba3496b5c1f15835bd074504aead3e013db64d216fd3da3a76c5340f52087f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7949dfe42f139b6a2fdf60406246a097c9e0fcc0b76e2bd0ffcb85d2d9e9d962",
+        "lastblockhash" : "0x2e54b9d0aaf48b25e68f40e5835edc85844412fcf9f5b2c548e38a7e78680293",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -597,155 +297,5 @@
                 }
             }
         }
-    },
-    "callcodecallcodecallcode_111_OOGMBefore_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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_OOGMBefore_d0g0v0Filler.json",
-            "sourceHash" : "8680229557d8d99031df51304f2780594a01747439f4d78217afcdb449be2409"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0150c6",
-                    "hash" : "0xaccd2dfd7258c1e99835a15eb56d8e46afc2eed73f7fb6b204ea0565b383b06e",
-                    "mixHash" : "0x4358b5bc83b5c805eb57dd35890471d09c956ec0cd1c1d0ac770daeeca824595",
-                    "nonce" : "0x603edb0a9dc746d6",
-                    "number" : "0x01",
-                    "parentHash" : "0x3b6502fa4206825f7a763c3d43657916aaa3e4bbd93bb006bc6f06793b42d872",
-                    "receiptTrie" : "0xbc2a594f52748d5d5cba9a274079eb9e91679a9a5d0074c118ec2620966e09e2",
-                    "stateRoot" : "0x75571de7e88c2635725dfec62b858d26462fc95cf6dc828fb8daf8b7741a4e71",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xa9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055e",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a03b6502fa4206825f7a763c3d43657916aaa3e4bbd93bb006bc6f06793b42d872a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa075571de7e88c2635725dfec62b858d26462fc95cf6dc828fb8daf8b7741a4e71a0a9196e82a3a9d85d7bcc420dbac78c908768ad2d33a3655ba2e493e2d6dc055ea0bc2a594f52748d5d5cba9a274079eb9e91679a9a5d0074c118ec2620966e09e2b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830150c68203e880a04358b5bc83b5c805eb57dd35890471d09c956ec0cd1c1d0ac770daeeca82459588603edb0a9dc746d6f862f860800183029fe094100000000000000000000000000000000000000080801ba0baf8a8f59325064cb79441e4e78350cedcb7f76317c4f8d9ed321025db52916ba04cc988db9cec57eda456bb242201bb41c723f2427ff750123f11af6b759547e2c0",
-                "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" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x3b6502fa4206825f7a763c3d43657916aaa3e4bbd93bb006bc6f06793b42d872",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xdba3496b5c1f15835bd074504aead3e013db64d216fd3da3a76c5340f52087f0",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dba3496b5c1f15835bd074504aead3e013db64d216fd3da3a76c5340f52087f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xaccd2dfd7258c1e99835a15eb56d8e46afc2eed73f7fb6b204ea0565b383b06e",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f550c6",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a762af3a",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002619c90f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60016003526040600060406000731000000000000000000000000000000000000003614e34f4600255",
-                "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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEnd_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEnd_d0g0v0.json
index 420255d26..d779edd6e 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEnd_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEnd_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_SuicideEnd_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "bb5004ad1527ade1be547573138287ec4dcad6332fae1e84a17a5f8acea8a30a"
+            "sourceHash" : "a0485e7f12f0b7883601f621a070e35ad1700c41f51e80a144f4a7a6acb21dc7"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x017d3c",
-                    "hash" : "0x6ebe54663efdc31695b6e43aad2a3539808c8eb402267ff0fd7e945b4f4aae08",
-                    "mixHash" : "0x0c823125553d0b711fbad9a82b7af4aa53692b7a95009585910634faf171ded4",
-                    "nonce" : "0x116ec22751805810",
+                    "hash" : "0x727912eb6929513ad9c0b2fdd162885550ef510e1475f478bfb548051e3b5f50",
+                    "mixHash" : "0xf1592dda927fa7c015fa2b64b3ed5080788e249b41da5eb315fccbe9087c599c",
+                    "nonce" : "0xe070c63e09420705",
                     "number" : "0x01",
                     "parentHash" : "0xde7e6ee5f4af4213cb89ee74f79fdb67d010f111a65d5d1d68840336bf223940",
                     "receiptTrie" : "0xf1a8bfa772c02ae9e0711bf7401a460bc5c2df9793d8f2b8f47c8aa9e6ef4640",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0de7e6ee5f4af4213cb89ee74f79fdb67d010f111a65d5d1d68840336bf223940a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c4eccbaabf81c494ba8ab2d9c62ffa639be5906d0f81e75b5980b4368b44bc4a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f1a8bfa772c02ae9e0711bf7401a460bc5c2df9793d8f2b8f47c8aa9e6ef4640b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083017d3c8203e880a00c823125553d0b711fbad9a82b7af4aa53692b7a95009585910634faf171ded488116ec22751805810f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0de7e6ee5f4af4213cb89ee74f79fdb67d010f111a65d5d1d68840336bf223940a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04c4eccbaabf81c494ba8ab2d9c62ffa639be5906d0f81e75b5980b4368b44bc4a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0f1a8bfa772c02ae9e0711bf7401a460bc5c2df9793d8f2b8f47c8aa9e6ef4640b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083017d3c8203e880a0f1592dda927fa7c015fa2b64b3ed5080788e249b41da5eb315fccbe9087c599c88e070c63e09420705f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015529496618bb19c630287ce6ece5672fe49214f6ddb93520d7576f155d866c3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6ebe54663efdc31695b6e43aad2a3539808c8eb402267ff0fd7e945b4f4aae08",
+        "lastblockhash" : "0x727912eb6929513ad9c0b2fdd162885550ef510e1475f478bfb548051e3b5f50",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -143,301 +143,13 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_SuicideEnd_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "bb5004ad1527ade1be547573138287ec4dcad6332fae1e84a17a5f8acea8a30a"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x017d3c",
-                    "hash" : "0x2cc0dd7fd3e16db73dadb9f0151e67b857e3c273f1b884399e6f933ca1044604",
-                    "mixHash" : "0x87c47efd0d940bbaa2266fcbcef98e004a76038b4a7d018cafde441b07264eaf",
-                    "nonce" : "0x7c8b1ab80ce3a577",
-                    "number" : "0x01",
-                    "parentHash" : "0xde7e6ee5f4af4213cb89ee74f79fdb67d010f111a65d5d1d68840336bf223940",
-                    "receiptTrie" : "0xfde397a66bb0244180e5aeeb9e5cd9e2efc82f8aabdceca87dbb39bb1cf39ea8",
-                    "stateRoot" : "0x9da2fe5cc9e5724b005d09d45e98eef0f08e9e2af563912ee34af1ec5131f03f",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0de7e6ee5f4af4213cb89ee74f79fdb67d010f111a65d5d1d68840336bf223940a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09da2fe5cc9e5724b005d09d45e98eef0f08e9e2af563912ee34af1ec5131f03fa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0fde397a66bb0244180e5aeeb9e5cd9e2efc82f8aabdceca87dbb39bb1cf39ea8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083017d3c8203e880a087c47efd0d940bbaa2266fcbcef98e004a76038b4a7d018cafde441b07264eaf887c8b1ab80ce3a577f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xde7e6ee5f4af4213cb89ee74f79fdb67d010f111a65d5d1d68840336bf223940",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x15529496618bb19c630287ce6ece5672fe49214f6ddb93520d7576f155d866c3",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015529496618bb19c630287ce6ece5672fe49214f6ddb93520d7576f155d866c3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2cc0dd7fd3e16db73dadb9f0151e67b857e3c273f1b884399e6f933ca1044604",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a763ffff",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x04a817c801",
-                "code" : "0x60406000604060006001731000000000000000000000000000000000000002620186a0f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f57d3c",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76282c4",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006001731000000000000000000000000000000000000002620186a0f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000600273100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcodecallcode_111_SuicideEnd_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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "bb5004ad1527ade1be547573138287ec4dcad6332fae1e84a17a5f8acea8a30a"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x017d3c",
-                    "hash" : "0xae0f1c49340b3958e720018d765961ed3567d1109ab341130dbada2769eb2f54",
-                    "mixHash" : "0x38c7847066b0ad16d8605b6b2bf6fce5f89c46c0eccf128d82c0e3ade0032d8d",
-                    "nonce" : "0x9ada86bf4b8d45da",
-                    "number" : "0x01",
-                    "parentHash" : "0xde7e6ee5f4af4213cb89ee74f79fdb67d010f111a65d5d1d68840336bf223940",
-                    "receiptTrie" : "0xfde397a66bb0244180e5aeeb9e5cd9e2efc82f8aabdceca87dbb39bb1cf39ea8",
-                    "stateRoot" : "0x9da2fe5cc9e5724b005d09d45e98eef0f08e9e2af563912ee34af1ec5131f03f",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0de7e6ee5f4af4213cb89ee74f79fdb67d010f111a65d5d1d68840336bf223940a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09da2fe5cc9e5724b005d09d45e98eef0f08e9e2af563912ee34af1ec5131f03fa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0fde397a66bb0244180e5aeeb9e5cd9e2efc82f8aabdceca87dbb39bb1cf39ea8b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083017d3c8203e880a038c7847066b0ad16d8605b6b2bf6fce5f89c46c0eccf128d82c0e3ade0032d8d889ada86bf4b8d45daf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xde7e6ee5f4af4213cb89ee74f79fdb67d010f111a65d5d1d68840336bf223940",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x15529496618bb19c630287ce6ece5672fe49214f6ddb93520d7576f155d866c3",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015529496618bb19c630287ce6ece5672fe49214f6ddb93520d7576f155d866c3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xae0f1c49340b3958e720018d765961ed3567d1109ab341130dbada2769eb2f54",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a763ffff",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x04a817c801",
-                "code" : "0x60406000604060006001731000000000000000000000000000000000000002620186a0f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f57d3c",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76282c4",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006001731000000000000000000000000000000000000002620186a0f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000600273100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcodecallcode_111_SuicideEnd_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "bb5004ad1527ade1be547573138287ec4dcad6332fae1e84a17a5f8acea8a30a"
+            "sourceHash" : "a0485e7f12f0b7883601f621a070e35ad1700c41f51e80a144f4a7a6acb21dc7"
         },
         "blocks" : [
             {
@@ -448,9 +160,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0xa8511fba72311d51524ff853a806afd265f84ad042da082009de16c1eb6eceeb",
-                    "mixHash" : "0x959e9e577d1c6ed4c4815544be52f2b84e416d34051f51fd4fd30bf70ae44197",
-                    "nonce" : "0xe1c836953422806e",
+                    "hash" : "0xc5f1dcb4f38a6e1d005ac1a5385903d4dcafe90288f666ce712da3a19bb16fe5",
+                    "mixHash" : "0x632dc31cdb30437d520d12bce863fc7fe50069d09604ef4ad7c05abd5c2a3a46",
+                    "nonce" : "0x0aabdb427e79bdef",
                     "number" : "0x01",
                     "parentHash" : "0xde7e6ee5f4af4213cb89ee74f79fdb67d010f111a65d5d1d68840336bf223940",
                     "receiptTrie" : "0x3cd531f33edff404c34a4e61ca761cc41e9067e4b9b191098076631ba2abdfd7",
@@ -459,10 +171,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0de7e6ee5f4af4213cb89ee74f79fdb67d010f111a65d5d1d68840336bf223940a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048bd57bbed3cbe7225c777bb8f25ac2f3c6f9aeb5126c0aafe51ccbf70abd784a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03cd531f33edff404c34a4e61ca761cc41e9067e4b9b191098076631ba2abdfd7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0959e9e577d1c6ed4c4815544be52f2b84e416d34051f51fd4fd30bf70ae4419788e1c836953422806ef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0de7e6ee5f4af4213cb89ee74f79fdb67d010f111a65d5d1d68840336bf223940a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa048bd57bbed3cbe7225c777bb8f25ac2f3c6f9aeb5126c0aafe51ccbf70abd784a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a03cd531f33edff404c34a4e61ca761cc41e9067e4b9b191098076631ba2abdfd7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0632dc31cdb30437d520d12bce863fc7fe50069d09604ef4ad7c05abd5c2a3a46880aabdb427e79bdeff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -496,7 +208,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015529496618bb19c630287ce6ece5672fe49214f6ddb93520d7576f155d866c3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa8511fba72311d51524ff853a806afd265f84ad042da082009de16c1eb6eceeb",
+        "lastblockhash" : "0xc5f1dcb4f38a6e1d005ac1a5385903d4dcafe90288f666ce712da3a19bb16fe5",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -579,149 +291,5 @@
                 }
             }
         }
-    },
-    "callcodecallcodecallcode_111_SuicideEnd_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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideEnd_d0g0v0Filler.json",
-            "sourceHash" : "bb5004ad1527ade1be547573138287ec4dcad6332fae1e84a17a5f8acea8a30a"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0161f8",
-                    "hash" : "0x59edcb583ccab3601757389c95788d553289e67cfe224f3d4a696ff052ec7b88",
-                    "mixHash" : "0xca96cdf24349848aea0c985e57257f1483c88f81e892d2440ab30e82eeb367ce",
-                    "nonce" : "0xa79cb7cea87fd2be",
-                    "number" : "0x01",
-                    "parentHash" : "0xde7e6ee5f4af4213cb89ee74f79fdb67d010f111a65d5d1d68840336bf223940",
-                    "receiptTrie" : "0x08c7b43ca06119e4d156c011e93da507854ffcfea8b7551f5d630227b0c2af5b",
-                    "stateRoot" : "0xf7e6daed6135e2e5d64593b067898ee24632e13ef075117563a68e9611fc3cba",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0de7e6ee5f4af4213cb89ee74f79fdb67d010f111a65d5d1d68840336bf223940a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f7e6daed6135e2e5d64593b067898ee24632e13ef075117563a68e9611fc3cbaa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a008c7b43ca06119e4d156c011e93da507854ffcfea8b7551f5d630227b0c2af5bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830161f88203e880a0ca96cdf24349848aea0c985e57257f1483c88f81e892d2440ab30e82eeb367ce88a79cb7cea87fd2bef862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xde7e6ee5f4af4213cb89ee74f79fdb67d010f111a65d5d1d68840336bf223940",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x15529496618bb19c630287ce6ece5672fe49214f6ddb93520d7576f155d866c3",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa015529496618bb19c630287ce6ece5672fe49214f6ddb93520d7576f155d866c3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x59edcb583ccab3601757389c95788d553289e67cfe224f3d4a696ff052ec7b88",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a763ffff",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x04a817c801",
-                "code" : "0x60406000604060006001731000000000000000000000000000000000000002620186a0f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f561f8",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7629e08",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060006001731000000000000000000000000000000000000002620186a0f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000600273100000000000000000000000000000000000000361c350f2600255731000000000000000000000000000000000000001ff",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0.json
index c495052f0..f864b1870 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_SuicideMiddle_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "c62f4d03bccbc2598e43cdfd3779999a09b5fb1fb63582abc85f0f8117cfb755"
+            "sourceHash" : "b92445b1de12b8f8d195e61cf5b97567cc655228239abf1a23f87273514071e4"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xa9c1",
-                    "hash" : "0xc9b5291b2579d88f083637ab1bd8fc5b5cbdb6af1ddc55fb653749ba49799390",
-                    "mixHash" : "0xe39cd4c2b4f1521f67efb33faefae6f43c7da7e27b090eff39f3cac5dd78af37",
-                    "nonce" : "0x5f9cb5c8064efd3f",
+                    "hash" : "0x47b8edecab139aa65b0ac741131cc8391c7a97a8eea8e54aaccca4df04be6a1c",
+                    "mixHash" : "0xad0420924f4760d22bb908a6955866e4ec8818259ffe5262c00c3cc6eb01282a",
+                    "nonce" : "0xc20b44c3ef02a423",
                     "number" : "0x01",
                     "parentHash" : "0xde134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810",
                     "receiptTrie" : "0xd4f71be0d5272c9236c0306000d02d23b7c1d4808e9bc5439aa72218a351a6c7",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0de134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029b648e5a76bc1212c1be9f802bf502f3c34ed5e7d270d505534f6699d30e43fa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d4f71be0d5272c9236c0306000d02d23b7c1d4808e9bc5439aa72218a351a6c7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c18203e880a0e39cd4c2b4f1521f67efb33faefae6f43c7da7e27b090eff39f3cac5dd78af37885f9cb5c8064efd3ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90260f901f8a0de134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029b648e5a76bc1212c1be9f802bf502f3c34ed5e7d270d505534f6699d30e43fa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0d4f71be0d5272c9236c0306000d02d23b7c1d4808e9bc5439aa72218a351a6c7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c18203e880a0ad0420924f4760d22bb908a6955866e4ec8818259ffe5262c00c3cc6eb01282a88c20b44c3ef02a423f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00606ae166668af3545774f33c684287f69ba8970dd9c98b50ac06caad57e2921a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc9b5291b2579d88f083637ab1bd8fc5b5cbdb6af1ddc55fb653749ba49799390",
+        "lastblockhash" : "0x47b8edecab139aa65b0ac741131cc8391c7a97a8eea8e54aaccca4df04be6a1c",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000001" : {
@@ -141,297 +141,13 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_SuicideMiddle_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "c62f4d03bccbc2598e43cdfd3779999a09b5fb1fb63582abc85f0f8117cfb755"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c1",
-                    "hash" : "0x50d22c1a3b61858f8ad0d198c5d896cd3135b1ce6072173b7c445b95e7884eac",
-                    "mixHash" : "0x9bc9b1569f02463d1357890efefe8fb81b8010a7cb24924c79bbc86bb196fdd6",
-                    "nonce" : "0x6a595c0dae40e0a8",
-                    "number" : "0x01",
-                    "parentHash" : "0xde134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810",
-                    "receiptTrie" : "0x0b7f8f5cf4feec413bb79774503cc5569ca34e37f6d563dc2a188bdce6ab8aff",
-                    "stateRoot" : "0x20135e22b18a34883c13e645ae584ef02e92d7ff2f39b9a13ff37dedc89c38bd",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0de134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa020135e22b18a34883c13e645ae584ef02e92d7ff2f39b9a13ff37dedc89c38bda05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a00b7f8f5cf4feec413bb79774503cc5569ca34e37f6d563dc2a188bdce6ab8affb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c18203e880a09bc9b1569f02463d1357890efefe8fb81b8010a7cb24924c79bbc86bb196fdd6886a595c0dae40e0a8f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xde134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x0606ae166668af3545774f33c684287f69ba8970dd9c98b50ac06caad57e2921",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00606ae166668af3545774f33c684287f69ba8970dd9c98b50ac06caad57e2921a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x50d22c1a3b61858f8ad0d198c5d896cd3135b1ce6072173b7c445b95e7884eac",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c1",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a763563f",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcodecallcode_111_SuicideMiddle_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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "c62f4d03bccbc2598e43cdfd3779999a09b5fb1fb63582abc85f0f8117cfb755"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xa9c1",
-                    "hash" : "0x207ee95c3e27aa3ec797c13b80bb633b60f577263bfc9ba60f22ae5d0fe90eff",
-                    "mixHash" : "0xbddf1550974092bbb0171e1c24cd09e2e8fb348c3b895850635daf60916cc809",
-                    "nonce" : "0x67a798632c11037f",
-                    "number" : "0x01",
-                    "parentHash" : "0xde134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810",
-                    "receiptTrie" : "0x0b7f8f5cf4feec413bb79774503cc5569ca34e37f6d563dc2a188bdce6ab8aff",
-                    "stateRoot" : "0x20135e22b18a34883c13e645ae584ef02e92d7ff2f39b9a13ff37dedc89c38bd",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0de134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa020135e22b18a34883c13e645ae584ef02e92d7ff2f39b9a13ff37dedc89c38bda05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a00b7f8f5cf4feec413bb79774503cc5569ca34e37f6d563dc2a188bdce6ab8affb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082a9c18203e880a0bddf1550974092bbb0171e1c24cd09e2e8fb348c3b895850635daf60916cc8098867a798632c11037ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xde134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x0606ae166668af3545774f33c684287f69ba8970dd9c98b50ac06caad57e2921",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00606ae166668af3545774f33c684287f69ba8970dd9c98b50ac06caad57e2921a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x207ee95c3e27aa3ec797c13b80bb633b60f577263bfc9ba60f22ae5d0fe90eff",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a9c1",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a763563f",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcodecallcode_111_SuicideMiddle_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "c62f4d03bccbc2598e43cdfd3779999a09b5fb1fb63582abc85f0f8117cfb755"
+            "sourceHash" : "b92445b1de12b8f8d195e61cf5b97567cc655228239abf1a23f87273514071e4"
         },
         "blocks" : [
             {
@@ -442,9 +158,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0xb24c6f41fc0ba63c0dd3041eeef7efa2519999aaa9715129652e114c4b2595e7",
-                    "mixHash" : "0xf945b28a0e1a7d648f952aa4dc516f9ea4cacaaa19c345bc2466d752c7fb097e",
-                    "nonce" : "0xfab53404508c4c57",
+                    "hash" : "0x37f459dbdf218a3cfcc722c79223206b71f9318592edece9dd9b1a1edd6aba7d",
+                    "mixHash" : "0xc374993bc236b42113007908e67c9b1abd08e13f2306e47feda19d63b4d3e9a4",
+                    "nonce" : "0xc5cedca201072bc3",
                     "number" : "0x01",
                     "parentHash" : "0xde134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810",
                     "receiptTrie" : "0x635c0d28a873f43c0adf0cf5d31f84270272d1d6e55d81bca9f6c376556c13af",
@@ -453,10 +169,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a0de134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e173ce07aa870aa515b44a7fbff39a25e16f639a669cb18a4508cf105369b552a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0635c0d28a873f43c0adf0cf5d31f84270272d1d6e55d81bca9f6c376556c13afb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0f945b28a0e1a7d648f952aa4dc516f9ea4cacaaa19c345bc2466d752c7fb097e88fab53404508c4c57f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a0de134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e173ce07aa870aa515b44a7fbff39a25e16f639a669cb18a4508cf105369b552a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0635c0d28a873f43c0adf0cf5d31f84270272d1d6e55d81bca9f6c376556c13afb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0c374993bc236b42113007908e67c9b1abd08e13f2306e47feda19d63b4d3e9a488c5cedca201072bc3f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -490,7 +206,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00606ae166668af3545774f33c684287f69ba8970dd9c98b50ac06caad57e2921a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb24c6f41fc0ba63c0dd3041eeef7efa2519999aaa9715129652e114c4b2595e7",
+        "lastblockhash" : "0x37f459dbdf218a3cfcc722c79223206b71f9318592edece9dd9b1a1edd6aba7d",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -573,147 +289,5 @@
                 }
             }
         }
-    },
-    "callcodecallcodecallcode_111_SuicideMiddle_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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_SuicideMiddle_d0g0v0Filler.json",
-            "sourceHash" : "c62f4d03bccbc2598e43cdfd3779999a09b5fb1fb63582abc85f0f8117cfb755"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x9111",
-                    "hash" : "0xa2ab0737dfc7bda15f683ee32c81619b0a0222a2a19c7b3e96c7b2d704515294",
-                    "mixHash" : "0xac0756b450f2a3043603d4b739f203552cdbd1b6b949d6f948caf945ea9ee2c7",
-                    "nonce" : "0x38d8b31d2755644b",
-                    "number" : "0x01",
-                    "parentHash" : "0xde134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810",
-                    "receiptTrie" : "0x7f2851885aa7b30432599f01dba0581dbb9bccc0f9b488761be28ede6f2ab3a7",
-                    "stateRoot" : "0xdf193661679fb0f54afd51e9d092d4f6b9df6b293f864be7c8a9dc3b6994af69",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0de134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0df193661679fb0f54afd51e9d092d4f6b9df6b293f864be7c8a9dc3b6994af69a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a07f2851885aa7b30432599f01dba0581dbb9bccc0f9b488761be28ede6f2ab3a7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c3808291118203e880a0ac0756b450f2a3043603d4b739f203552cdbd1b6b949d6f948caf945ea9ee2c78838d8b31d2755644bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xde134005acd5077be06395376a5edf7c8b03b8831b49fa0245c7e568a6a33810",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x0606ae166668af3545774f33c684287f69ba8970dd9c98b50ac06caad57e2921",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00606ae166668af3545774f33c684287f69ba8970dd9c98b50ac06caad57e2921a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa2ab0737dfc7bda15f683ee32c81619b0a0222a2a19c7b3e96c7b2d704515294",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f49111",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7636eef",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000001620249f0f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620186a0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x731000000000000000000000000000000000000000ff604060006040600073100000000000000000000000000000000000000361c350f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6001600355",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_d0g0v0.json
index 7b29e1c8d..156cb9dcd 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_111_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_d0g0v0Filler.json",
-            "sourceHash" : "fb3159f40e58c66a292679b211216bcacac7e64a70593f3a76fa3800f82de0cc"
+            "sourceHash" : "0ec447586cf607f05669db5ec0411f431bea52a5a00124ecf4087628cf566d5b"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x037b7e",
-                    "hash" : "0x88611c16dab02783012dc5a940585adc1e0acec53a656dd02a739aaf73c6f9f7",
-                    "mixHash" : "0xd087e54babc67e4a6d8080c1ece1ff3eca38e6f3c989da5dc2db247644f0e67d",
-                    "nonce" : "0xeecc95ca889ebdd9",
+                    "hash" : "0x5564e75bb8c3dbdfd020580f8541dac9b5be825be278be49eb42cf0aa170930a",
+                    "mixHash" : "0x853cc60f45101f57ada58896b284c471b4617110dd390897736638cae6f7c738",
+                    "nonce" : "0x781574268459b4ad",
                     "number" : "0x01",
                     "parentHash" : "0x22e5997fb308621a48b2eeb7560f324a9905255d90eaac365122da40a71dcfc6",
                     "receiptTrie" : "0x9a85dff11e6b6862aa10d4eb2498e37b74808b727f3ce67f614848e34895f942",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a022e5997fb308621a48b2eeb7560f324a9905255d90eaac365122da40a71dcfc6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d21e8767f9187a55e8f6787e53e94d4991b455214f9b04abdf393400693b43f1a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09a85dff11e6b6862aa10d4eb2498e37b74808b727f3ce67f614848e34895f942b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083037b7e8203e880a0d087e54babc67e4a6d8080c1ece1ff3eca38e6f3c989da5dc2db247644f0e67d88eecc95ca889ebdd9f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a022e5997fb308621a48b2eeb7560f324a9905255d90eaac365122da40a71dcfc6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0d21e8767f9187a55e8f6787e53e94d4991b455214f9b04abdf393400693b43f1a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a09a85dff11e6b6862aa10d4eb2498e37b74808b727f3ce67f614848e34895f942b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083037b7e8203e880a0853cc60f45101f57ada58896b284c471b4617110dd390897736638cae6f7c73888781574268459b4adf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0450a56d8445381aefdcb0f2b74ac34a58e5061ac730abe1f7cf9d26d2216e99da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x88611c16dab02783012dc5a940585adc1e0acec53a656dd02a739aaf73c6f9f7",
+        "lastblockhash" : "0x5564e75bb8c3dbdfd020580f8541dac9b5be825be278be49eb42cf0aa170930a",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -158,331 +158,13 @@
             }
         }
     },
-    "callcodecallcodecallcode_111_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_d0g0v0Filler.json",
-            "sourceHash" : "fb3159f40e58c66a292679b211216bcacac7e64a70593f3a76fa3800f82de0cc"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x037b7e",
-                    "hash" : "0x98127a63454e46cc99a2f98d65546f2c5f035fa243a120ed4fd5f51c0174cfeb",
-                    "mixHash" : "0xb070804a63f8b9006b4a265d804648c3e0192eed7db2e951cabd611f87970b41",
-                    "nonce" : "0xec15e093ff16f14f",
-                    "number" : "0x01",
-                    "parentHash" : "0x22e5997fb308621a48b2eeb7560f324a9905255d90eaac365122da40a71dcfc6",
-                    "receiptTrie" : "0xaffe7a28ba1c66e592aa345800db1b64bbc11e1dd18a6b373e53689bb45f4b6e",
-                    "stateRoot" : "0x7c65f6ef938c6076a8b4ee84a619bb4b176d358186cafc2c7fc783a56f7773da",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a022e5997fb308621a48b2eeb7560f324a9905255d90eaac365122da40a71dcfc6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c65f6ef938c6076a8b4ee84a619bb4b176d358186cafc2c7fc783a56f7773daa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0affe7a28ba1c66e592aa345800db1b64bbc11e1dd18a6b373e53689bb45f4b6eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083037b7e8203e880a0b070804a63f8b9006b4a265d804648c3e0192eed7db2e951cabd611f87970b4188ec15e093ff16f14ff862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x22e5997fb308621a48b2eeb7560f324a9905255d90eaac365122da40a71dcfc6",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x450a56d8445381aefdcb0f2b74ac34a58e5061ac730abe1f7cf9d26d2216e99d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0450a56d8445381aefdcb0f2b74ac34a58e5061ac730abe1f7cf9d26d2216e99da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x98127a63454e46cc99a2f98d65546f2c5f035fa243a120ed4fd5f51c0174cfeb",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x014a" : "0x1000000000000000000000000000000000000000",
-                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x0150" : "0x40",
-                    "0x0152" : "0x26",
-                    "0x0154" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01",
-                    "0x04" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000036203d090f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f77b7e",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7608482",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000036203d090f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcodecallcode_111_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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_d0g0v0Filler.json",
-            "sourceHash" : "fb3159f40e58c66a292679b211216bcacac7e64a70593f3a76fa3800f82de0cc"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x037b7e",
-                    "hash" : "0x4be0d559383e56be79572930b8b12b92ad238d9dac5abe91388b166a389c0362",
-                    "mixHash" : "0x572dd7b89cc56c1a3ce5ae01f74de8485177ea1e998389efa8b310da400abb35",
-                    "nonce" : "0xceb7d407b3e6ae8b",
-                    "number" : "0x01",
-                    "parentHash" : "0x22e5997fb308621a48b2eeb7560f324a9905255d90eaac365122da40a71dcfc6",
-                    "receiptTrie" : "0xaffe7a28ba1c66e592aa345800db1b64bbc11e1dd18a6b373e53689bb45f4b6e",
-                    "stateRoot" : "0x7c65f6ef938c6076a8b4ee84a619bb4b176d358186cafc2c7fc783a56f7773da",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a022e5997fb308621a48b2eeb7560f324a9905255d90eaac365122da40a71dcfc6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07c65f6ef938c6076a8b4ee84a619bb4b176d358186cafc2c7fc783a56f7773daa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a0affe7a28ba1c66e592aa345800db1b64bbc11e1dd18a6b373e53689bb45f4b6eb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38083037b7e8203e880a0572dd7b89cc56c1a3ce5ae01f74de8485177ea1e998389efa8b310da400abb3588ceb7d407b3e6ae8bf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x22e5997fb308621a48b2eeb7560f324a9905255d90eaac365122da40a71dcfc6",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x450a56d8445381aefdcb0f2b74ac34a58e5061ac730abe1f7cf9d26d2216e99d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0450a56d8445381aefdcb0f2b74ac34a58e5061ac730abe1f7cf9d26d2216e99da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4be0d559383e56be79572930b8b12b92ad238d9dac5abe91388b166a389c0362",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x014a" : "0x1000000000000000000000000000000000000000",
-                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x0150" : "0x40",
-                    "0x0152" : "0x26",
-                    "0x0154" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01",
-                    "0x04" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000036203d090f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f77b7e",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7608482",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000036203d090f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcodecallcode_111_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_d0g0v0Filler.json",
-            "sourceHash" : "fb3159f40e58c66a292679b211216bcacac7e64a70593f3a76fa3800f82de0cc"
+            "sourceHash" : "0ec447586cf607f05669db5ec0411f431bea52a5a00124ecf4087628cf566d5b"
         },
         "blocks" : [
             {
@@ -493,9 +175,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x33ca8e998928c712ff3d4c51a2a1696368ca03b02a5ccfae4d5771a7e4dc7b71",
-                    "mixHash" : "0x8f3a28906e3c55e722c912dc74f80d1a33d769a41efc13de6439331245f9e6f3",
-                    "nonce" : "0x4d11c18517d40004",
+                    "hash" : "0x76256592dc867eccc5ae34ac26270640b99416b62615de5417f8b13a0db2584b",
+                    "mixHash" : "0x7c7b4c5c66779755f05ca75bb27177932826f36586551b8f7fa7f4445d63856c",
+                    "nonce" : "0x8d942abebd1d69fa",
                     "number" : "0x01",
                     "parentHash" : "0x22e5997fb308621a48b2eeb7560f324a9905255d90eaac365122da40a71dcfc6",
                     "receiptTrie" : "0x8d695ef531398b3d52039e4adf0580d352f2291974ac3bc6e8201123325a7375",
@@ -504,10 +186,10 @@
                     "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a022e5997fb308621a48b2eeb7560f324a9905255d90eaac365122da40a71dcfc6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f93256f8d1fccc62d588b12b59d06cdb9eedbf387f505b0f8d43dc17f69194e6a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a08d695ef531398b3d52039e4adf0580d352f2291974ac3bc6e8201123325a7375b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a08f3a28906e3c55e722c912dc74f80d1a33d769a41efc13de6439331245f9e6f3884d11c18517d40004f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
+                "rlp" : "0xf90261f901f9a022e5997fb308621a48b2eeb7560f324a9905255d90eaac365122da40a71dcfc6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f93256f8d1fccc62d588b12b59d06cdb9eedbf387f505b0f8d43dc17f69194e6a05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a08d695ef531398b3d52039e4adf0580d352f2291974ac3bc6e8201123325a7375b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a07c7b4c5c66779755f05ca75bb27177932826f36586551b8f7fa7f4445d63856c888d942abebd1d69faf862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -541,7 +223,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0450a56d8445381aefdcb0f2b74ac34a58e5061ac730abe1f7cf9d26d2216e99da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x33ca8e998928c712ff3d4c51a2a1696368ca03b02a5ccfae4d5771a7e4dc7b71",
+        "lastblockhash" : "0x76256592dc867eccc5ae34ac26270640b99416b62615de5417f8b13a0db2584b",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -624,164 +306,5 @@
                 }
             }
         }
-    },
-    "callcodecallcodecallcode_111_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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_111_d0g0v0Filler.json",
-            "sourceHash" : "fb3159f40e58c66a292679b211216bcacac7e64a70593f3a76fa3800f82de0cc"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x0373c2",
-                    "hash" : "0xc33a7afcaa81c4babe8e96aa96a7286746ad3debb303845620e9d7349f51b7bb",
-                    "mixHash" : "0x14bcafa78a0dba394a31815a3c8bc2b63160400a59d27e660b2aaa306f633499",
-                    "nonce" : "0x89388131b6edbea9",
-                    "number" : "0x01",
-                    "parentHash" : "0x22e5997fb308621a48b2eeb7560f324a9905255d90eaac365122da40a71dcfc6",
-                    "receiptTrie" : "0x96e3429c48c1575f99748731804309fe9ef68dfcfd873c8ced2631ea76fccfdd",
-                    "stateRoot" : "0x9d4ffbb6ebbed39abe3d31a14d98c7d7125a5bd301d8bad7086a11f66f3963ba",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a022e5997fb308621a48b2eeb7560f324a9905255d90eaac365122da40a71dcfc6a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09d4ffbb6ebbed39abe3d31a14d98c7d7125a5bd301d8bad7086a11f66f3963baa05d88595a2b9f129f2901f79a207ca2d95f38ac387707e6cb1de43679d06079d4a096e3429c48c1575f99748731804309fe9ef68dfcfd873c8ced2631ea76fccfddb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380830373c28203e880a014bcafa78a0dba394a31815a3c8bc2b63160400a59d27e660b2aaa306f6334998889388131b6edbea9f862f8608001832dc6c094100000000000000000000000000000000000000080801ba0bc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9a03a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbc3f717090c5b3d46550833ec05cc91a3c352bd18be2c0eed5ed3e54e8af58f9",
-                        "s" : "0x3a7d01021289eca372726c91175e4f422da3147bd3961cd66ca95f1cf3619fb2",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x22e5997fb308621a48b2eeb7560f324a9905255d90eaac365122da40a71dcfc6",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x450a56d8445381aefdcb0f2b74ac34a58e5061ac730abe1f7cf9d26d2216e99d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0450a56d8445381aefdcb0f2b74ac34a58e5061ac730abe1f7cf9d26d2216e99da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc33a7afcaa81c4babe8e96aa96a7286746ad3debb303845620e9d7349f51b7bb",
-        "network" : "Homestead",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01",
-                    "0x014a" : "0x1000000000000000000000000000000000000000",
-                    "0x014c" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x0150" : "0x40",
-                    "0x0152" : "0x26",
-                    "0x0154" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01",
-                    "0x04" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000036203d090f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f773c2",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7608c3e",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000162055730f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620493e0f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x00",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000036203d090f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000003" : {
-                "balance" : "0x00",
-                "code" : "0x600160035533600455346007553061014a553261014c55366101505538610152553a61015455",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
     }
 }
 \ No newline at end of file
diff --git a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0.json b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0.json
index 82fde34c8..50260cb62 100644
--- a/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodecallcodecallcode_ABCB_RECURSIVE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "2a1f6b465b0a6f4a3f51fc91b929ca3921597c062b052ad719ee44a657a37985"
+            "sourceHash" : "f29723237af09656599dc3526ff11e5f88be7666d9096fe15e7e17d00fd2c263"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08ab75",
-                    "hash" : "0x470a2b649cd3d55879c66f8bca81629342bccf0d9894a438fc68ff9f9fa02cbc",
-                    "mixHash" : "0xb467840eeedef57715b54b27b1d08911c8f87287ee4067c661a910a19639e8fa",
-                    "nonce" : "0xce513fb38eca20f3",
+                    "hash" : "0x7421d73edd93a43635f98c4648306b6690bad15ef9a94526cf076de984549963",
+                    "mixHash" : "0xdec71bfc1edd1c00f92b00bc700d0d5f036613a154e3c31f231f937e76b666a2",
+                    "nonce" : "0xa8fa1880c508022d",
                     "number" : "0x01",
                     "parentHash" : "0x55a9b7b500a6d9c823b154deff320d0551f52174bf3e705de8942f44ff6315ab",
                     "receiptTrie" : "0xcd5e145de97819e63853320a299714c3d51d5b0d583cacca4a88fd1b09680400",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a055a9b7b500a6d9c823b154deff320d0551f52174bf3e705de8942f44ff6315aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036fd157564f49c98c170ba1131bf9f4c326fc3aa8fb6cca6e24906244671de42a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0cd5e145de97819e63853320a299714c3d51d5b0d583cacca4a88fd1b09680400b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab758203e880a0b467840eeedef57715b54b27b1d08911c8f87287ee4067c661a910a19639e8fa88ce513fb38eca20f3f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a055a9b7b500a6d9c823b154deff320d0551f52174bf3e705de8942f44ff6315aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa036fd157564f49c98c170ba1131bf9f4c326fc3aa8fb6cca6e24906244671de42a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0cd5e145de97819e63853320a299714c3d51d5b0d583cacca4a88fd1b09680400b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab758203e880a0dec71bfc1edd1c00f92b00bc700d0d5f036613a154e3c31f231f937e76b666a288a8fa1880c508022df863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb2beaf4617d4e9ea4f51834d6f5d1ad2eb9bc01f6ea70ddf30c5b7c3a39ae6fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x470a2b649cd3d55879c66f8bca81629342bccf0d9894a438fc68ff9f9fa02cbc",
+        "lastblockhash" : "0x7421d73edd93a43635f98c4648306b6690bad15ef9a94526cf076de984549963",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -136,287 +136,13 @@
             }
         }
     },
-    "callcodecallcodecallcode_ABCB_RECURSIVE_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "2a1f6b465b0a6f4a3f51fc91b929ca3921597c062b052ad719ee44a657a37985"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08ab75",
-                    "hash" : "0xc1c7631197d992d6be8f406eac76713be619fa36f0fff28c62986209cd5b4ea3",
-                    "mixHash" : "0x89cda05e28641b7d32ceec61ad9cbe3b56a90dd3aca09e3289e27292a8b76653",
-                    "nonce" : "0x17e82d9b654f0304",
-                    "number" : "0x01",
-                    "parentHash" : "0x55a9b7b500a6d9c823b154deff320d0551f52174bf3e705de8942f44ff6315ab",
-                    "receiptTrie" : "0xa58a06131c49497c542b3e01cdc616b453b660fab9594bd484a3ee08a9126ad3",
-                    "stateRoot" : "0x267e50c4d523969dbbcde28a70893f5c62f79d509417b340cc4f737ffa790b9a",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f9a055a9b7b500a6d9c823b154deff320d0551f52174bf3e705de8942f44ff6315aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0267e50c4d523969dbbcde28a70893f5c62f79d509417b340cc4f737ffa790b9aa06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0a58a06131c49497c542b3e01cdc616b453b660fab9594bd484a3ee08a9126ad3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab758203e880a089cda05e28641b7d32ceec61ad9cbe3b56a90dd3aca09e3289e27292a8b766538817e82d9b654f0304f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x01c9c380",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
-                        "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0xb2d05e00",
-            "gasUsed" : "0x00",
-            "hash" : "0x55a9b7b500a6d9c823b154deff320d0551f52174bf3e705de8942f44ff6315ab",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xfb2beaf4617d4e9ea4f51834d6f5d1ad2eb9bc01f6ea70ddf30c5b7c3a39ae6f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb2beaf4617d4e9ea4f51834d6f5d1ad2eb9bc01f6ea70ddf30c5b7c3a39ae6fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc1c7631197d992d6be8f406eac76713be619fa36f0fff28c62986209cd5b4ea3",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000163017d7840f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620f4240f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000016207a120f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fcab75",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b548b",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000163017d7840f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620f4240f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000016207a120f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodecallcodecallcode_ABCB_RECURSIVE_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/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "2a1f6b465b0a6f4a3f51fc91b929ca3921597c062b052ad719ee44a657a37985"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0xb2d05e00",
-                    "gasUsed" : "0x08ab75",
-                    "hash" : "0x2a4ecb99b8f718fc48b83b8ddcbac9b2ae50e22e16f2b57af1d571524ea928a7",
-                    "mixHash" : "0x7b7ba520c9b4c5363c97ca32344b0c7f3913ea823e7ec26738c53ab314c6efca",
-                    "nonce" : "0x94c686c9a86e7057",
-                    "number" : "0x01",
-                    "parentHash" : "0x55a9b7b500a6d9c823b154deff320d0551f52174bf3e705de8942f44ff6315ab",
-                    "receiptTrie" : "0xa58a06131c49497c542b3e01cdc616b453b660fab9594bd484a3ee08a9126ad3",
-                    "stateRoot" : "0x267e50c4d523969dbbcde28a70893f5c62f79d509417b340cc4f737ffa790b9a",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f9a055a9b7b500a6d9c823b154deff320d0551f52174bf3e705de8942f44ff6315aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0267e50c4d523969dbbcde28a70893f5c62f79d509417b340cc4f737ffa790b9aa06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0a58a06131c49497c542b3e01cdc616b453b660fab9594bd484a3ee08a9126ad3b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308ab758203e880a07b7ba520c9b4c5363c97ca32344b0c7f3913ea823e7ec26738c53ab314c6efca8894c686c9a86e7057f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x01c9c380",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x3e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426b",
-                        "s" : "0x5c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0xb2d05e00",
-            "gasUsed" : "0x00",
-            "hash" : "0x55a9b7b500a6d9c823b154deff320d0551f52174bf3e705de8942f44ff6315ab",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xfb2beaf4617d4e9ea4f51834d6f5d1ad2eb9bc01f6ea70ddf30c5b7c3a39ae6f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb2beaf4617d4e9ea4f51834d6f5d1ad2eb9bc01f6ea70ddf30c5b7c3a39ae6fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2a4ecb99b8f718fc48b83b8ddcbac9b2ae50e22e16f2b57af1d571524ea928a7",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000163017d7840f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620f4240f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000016207a120f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fcab75",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a75b548b",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x604060006040600073100000000000000000000000000000000000000163017d7840f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x02540be400",
-                "code" : "0x6040600060406000731000000000000000000000000000000000000002620f4240f4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000002" : {
-                "balance" : "0x02540be400",
-                "code" : "0x60406000604060007310000000000000000000000000000000000000016207a120f4600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodecallcodecallcode_ABCB_RECURSIVE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "2a1f6b465b0a6f4a3f51fc91b929ca3921597c062b052ad719ee44a657a37985"
+            "sourceHash" : "f29723237af09656599dc3526ff11e5f88be7666d9096fe15e7e17d00fd2c263"
         },
         "blocks" : [
             {
@@ -427,9 +153,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x01c9c380",
-                    "hash" : "0x542725c497ca483d85434a254708d3f9cf84bfa450415020c850ea859abecc68",
-                    "mixHash" : "0x11b221b03019b91afdc6b870fd3b53abd91e7f7d262f828a782f3270f65eaa83",
-                    "nonce" : "0x7a5264795bea06ce",
+                    "hash" : "0x423100e063f024c3a28c05b8d2785fec79eabb4d6c98f33469ca378239752544",
+                    "mixHash" : "0x35a939238f31e4e7faeb64123381b45893d6e980e8f864ac535ce7365510dc17",
+                    "nonce" : "0xe700b171b8009ee2",
                     "number" : "0x01",
                     "parentHash" : "0x55a9b7b500a6d9c823b154deff320d0551f52174bf3e705de8942f44ff6315ab",
                     "receiptTrie" : "0x5bd0a9811a7a88bb24d26bc2815d6d383f89b0ff14f637b77d7ea1903d4d3b1c",
@@ -438,10 +164,10 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901faa055a9b7b500a6d9c823b154deff320d0551f52174bf3e705de8942f44ff6315aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0260067afc80a15a44b83cb60517af0d13e520ea22ac234b41fbaca58296bb8b4a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a05bd0a9811a7a88bb24d26bc2815d6d383f89b0ff14f637b77d7ea1903d4d3b1cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008401c9c3808203e880a011b221b03019b91afdc6b870fd3b53abd91e7f7d262f828a782f3270f65eaa83887a5264795bea06cef863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90263f901faa055a9b7b500a6d9c823b154deff320d0551f52174bf3e705de8942f44ff6315aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0260067afc80a15a44b83cb60517af0d13e520ea22ac234b41fbaca58296bb8b4a06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a05bd0a9811a7a88bb24d26bc2815d6d383f89b0ff14f637b77d7ea1903d4d3b1cb9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008401c9c3808203e880a035a939238f31e4e7faeb64123381b45893d6e980e8f864ac535ce7365510dc1788e700b171b8009ee2f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -475,7 +201,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb2beaf4617d4e9ea4f51834d6f5d1ad2eb9bc01f6ea70ddf30c5b7c3a39ae6fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x542725c497ca483d85434a254708d3f9cf84bfa450415020c850ea859abecc68",
+        "lastblockhash" : "0x423100e063f024c3a28c05b8d2785fec79eabb4d6c98f33469ca378239752544",
         "network" : "Frontier",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -548,10 +274,10 @@
     "callcodecallcodecallcode_ABCB_RECURSIVE_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.619a6438.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stCallDelegateCodesCallCodeHomestead/callcodecallcodecallcode_ABCB_RECURSIVE_d0g0v0Filler.json",
-            "sourceHash" : "2a1f6b465b0a6f4a3f51fc91b929ca3921597c062b052ad719ee44a657a37985"
+            "sourceHash" : "f29723237af09656599dc3526ff11e5f88be7666d9096fe15e7e17d00fd2c263"
         },
         "blocks" : [
             {
@@ -562,9 +288,9 @@
                     "extraData" : "",
                     "gasLimit" : "0xb2d05e00",
                     "gasUsed" : "0x08a3b9",
-                    "hash" : "0x3d702baffa877a481a73df86b71de3c66987291cc5d74d83f329e340441d908c",
-                    "mixHash" : "0x7ee7830931a66b65f7c06d46572a4056542837d3b92d6ab12e8a4b60d5fd78b0",
-                    "nonce" : "0x9e8bc53271caa826",
+                    "hash" : "0x32f9bc4a12b049b8550689cc3e8bea2f8cd05f749ca55a62cc89f41b30f06146",
+                    "mixHash" : "0xcd4dfd15442d232d77430a51339842e9f470ca7d03ebd909af0377566f862744",
+                    "nonce" : "0xd6ecc2bb53c109fd",
                     "number" : "0x01",
                     "parentHash" : "0x55a9b7b500a6d9c823b154deff320d0551f52174bf3e705de8942f44ff6315ab",
                     "receiptTrie" : "0xb1e4a41cf60d9f25a0aadb8a69c03b4ccd0c5241f58128d1a74676cf5a1534e8",
@@ -573,10 +299,10 @@
                     "transactionsTrie" : "0x6488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f9a055a9b7b500a6d9c823b154deff320d0551f52174bf3e705de8942f44ff6315aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04260389a86a775be0f3d80ac458a488e6b5370476b4af7c0c0686e415068c7cba06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0b1e4a41cf60d9f25a0aadb8a69c03b4ccd0c5241f58128d1a74676cf5a1534e8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3b98203e880a07ee7830931a66b65f7c06d46572a4056542837d3b92d6ab12e8a4b60d5fd78b0889e8bc53271caa826f863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
+                "rlp" : "0xf90262f901f9a055a9b7b500a6d9c823b154deff320d0551f52174bf3e705de8942f44ff6315aba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04260389a86a775be0f3d80ac458a488e6b5370476b4af7c0c0686e415068c7cba06488b1eb775a36511b144fdf6f3b4ac280e5c90ef7ff99c833b5648a1a534477a0b1e4a41cf60d9f25a0aadb8a69c03b4ccd0c5241f58128d1a74676cf5a1534e8b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200000184b2d05e008308a3b98203e880a0cd4dfd15442d232d77430a51339842e9f470ca7d03ebd909af0377566f86274488d6ecc2bb53c109fdf863f86180018401c9c38094100000000000000000000000000000000000000080801ca03e4d54de189f528bc53f0d074377af1163f9485eed1f8cd3d16c476e147b426ba05c69650f46a2a5ef790ba203bbf1c4762eed89071ff84d32035517d09e836e33c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x01c9c380",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -610,7 +336,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fb2beaf4617d4e9ea4f51834d6f5d1ad2eb9bc01f6ea70ddf30c5b7c3a39ae6fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b9010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000830200008084b2d05e00808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3d702baffa877a481a73df86b71de3c66987291cc5d74d83f329e340441d908c",
+        "lastblockhash" : "0x32f9bc4a12b049b8550689cc3e8bea2f8cd05f749ca55a62cc89f41b30f06146",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
author	Dimitry <dimitry@ethereum.org>	2018-01-31 21:56:50 +0800
committer	Dimitry <dimitry@ethereum.org>	2018-01-31 21:56:50 +0800
commit	4a132816b3ff226cc17fefc71d02ae969a9afd4a (patch)
tree	102732a9e37b9a8bb391b124e1812a531e54b5ad /BlockchainTests
parent	37db3cd4a17596a7a9bc6488365e81d7c9743abe (diff)
download	dexon-tests-4a132816b3ff226cc17fefc71d02ae969a9afd4a.tar dexon-tests-4a132816b3ff226cc17fefc71d02ae969a9afd4a.tar.gz dexon-tests-4a132816b3ff226cc17fefc71d02ae969a9afd4a.tar.bz2 dexon-tests-4a132816b3ff226cc17fefc71d02ae969a9afd4a.tar.lz dexon-tests-4a132816b3ff226cc17fefc71d02ae969a9afd4a.tar.xz dexon-tests-4a132816b3ff226cc17fefc71d02ae969a9afd4a.tar.zst dexon-tests-4a132816b3ff226cc17fefc71d02ae969a9afd4a.zip