refill blockchain stDelegatecallTestHomestead

40 files changed, 750 insertions, 14227 deletions

diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0.json
index 8fd8bce24..267def6d5 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0.json
@@ -2,10 +2,10 @@
     "Call1024BalanceTooLow_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "6f59c4931554a3a59269050eabc675f8c268895f3f10436a97175f4e294e58a1"
+            "sourceHash" : "40441fac77c45979d74dc55ba8314ff901b2a2f60f3c5cbd38d7ea8145a97916"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xabc5ed",
-                    "hash" : "0x7aac122385e2fadea67785564c629a24d61068411f1a48fe8e5d3a1007fc1d35",
-                    "mixHash" : "0x97970dfb05761197d2e840d49c15980a48af6f1f92d3c4d9351ae48240373700",
-                    "nonce" : "0x71c163a95828e486",
+                    "hash" : "0x136c5c63c9bc61d18977502b373e7e366356ba1204a2e9ecb4739a98f5f8d065",
+                    "mixHash" : "0xc927628d04428f9581e0b0cf18091752f8254a7d74b97b8fec89190a767c48ae",
+                    "nonce" : "0x356a29188233c787",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
                     "receiptTrie" : "0x582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0c323f1e06b1aa65f236d366d9439d65a925d723d7c694ab034ffb9b8a83bccf8a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a0582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a097970dfb05761197d2e840d49c15980a48af6f1f92d3c4d9351ae482403737008871c163a95828e486f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0c323f1e06b1aa65f236d366d9439d65a925d723d7c694ab034ffb9b8a83bccf8a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a0582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0c927628d04428f9581e0b0cf18091752f8254a7d74b97b8fec89190a767c48ae88356a29188233c787f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x10000000d788",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7aac122385e2fadea67785564c629a24d61068411f1a48fe8e5d3a1007fc1d35",
+        "lastblockhash" : "0x136c5c63c9bc61d18977502b373e7e366356ba1204a2e9ecb4739a98f5f8d065",
         "network" : "Byzantium",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -122,380 +122,13 @@
             }
         }
     },
-    "Call1024BalanceTooLow_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "6f59c4931554a3a59269050eabc675f8c268895f3f10436a97175f4e294e58a1"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xabc5ed",
-                    "hash" : "0x62b338d8e7e68337f7b58e7c1d1906f1d33d916509fa04014d2483c28c99b5ff",
-                    "mixHash" : "0xf21c0448e6384d8f87854d4a0dad219f7ef8cd85914dd4fe046f800e7124e12a",
-                    "nonce" : "0xc17820bb248f46c4",
-                    "number" : "0x01",
-                    "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-                    "receiptTrie" : "0x6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
-                    "stateRoot" : "0xcd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceff",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0f21c0448e6384d8f87854d4a0dad219f7ef8cd85914dd4fe046f800e7124e12a88c17820bb248f46c4f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x10000000d788",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x5e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5",
-                        "s" : "0x494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57a",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x9103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x62b338d8e7e68337f7b58e7c1d1906f1d33d916509fa04014d2483c28c99b5ff",
-        "network" : "EIP150",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffff543a08",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182459fc5ed",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x040a",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x0401",
-                    "0x01" : "0x01"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "Call1024BalanceTooLow_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "6f59c4931554a3a59269050eabc675f8c268895f3f10436a97175f4e294e58a1"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xabc5ed",
-                    "hash" : "0x4a1ccb160286443ec3ace584e6318e24329b04d084d8ca4c21e5a446afa58495",
-                    "mixHash" : "0x9961a9fee4ae28ce54d84b95b37ea0406039fe909add70d7b9e4e48492cb6421",
-                    "nonce" : "0xa8c7276c6a5d346c",
-                    "number" : "0x01",
-                    "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-                    "receiptTrie" : "0x6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
-                    "stateRoot" : "0xcd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceff",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90268f901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a09961a9fee4ae28ce54d84b95b37ea0406039fe909add70d7b9e4e48492cb642188a8c7276c6a5d346cf865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x10000000d788",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x5e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5",
-                        "s" : "0x494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57a",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x9103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4a1ccb160286443ec3ace584e6318e24329b04d084d8ca4c21e5a446afa58495",
-        "network" : "EIP158",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffff543a08",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182459fc5ed",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x040a",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x0401",
-                    "0x01" : "0x01"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "Call1024BalanceTooLow_d0g0v0_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "6f59c4931554a3a59269050eabc675f8c268895f3f10436a97175f4e294e58a1"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x10000000d788",
-                    "hash" : "0x9ae413529ba7f0dde85bb02c567d81462890338cbbb2d5e700b6c7c45f9f08f7",
-                    "mixHash" : "0xa784d5e6cb0c18a173cfcb8271234070955fe8d5b58fdbb50d0d3a2401e9295a",
-                    "nonce" : "0x33d1042130f4ad35",
-                    "number" : "0x01",
-                    "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-                    "receiptTrie" : "0x1c3e6032954c01e731d060410eb7a9a8c1867507344832b6bc1e94397d8a8acf",
-                    "stateRoot" : "0x2ef1bd81d680ac311a8551299f9fc26abf8feffc5878766cc32842a32291b961",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026bf90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba02ef1bd81d680ac311a8551299f9fc26abf8feffc5878766cc32842a32291b961a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a01c3e6032954c01e731d060410eb7a9a8c1867507344832b6bc1e94397d8a8acfb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000d7888203e880a0a784d5e6cb0c18a173cfcb8271234070955fe8d5b58fdbb50d0d3a2401e9295a8833d1042130f4ad35f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x10000000d788",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x5e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5",
-                        "s" : "0x494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57a",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x9103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9ae413529ba7f0dde85bb02c567d81462890338cbbb2d5e700b6c7c45f9f08f7",
-        "network" : "Frontier",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffefffffff2877",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563a18244f4d788",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "Call1024BalanceTooLow_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/Call1024BalanceTooLow_d0g0v0Filler.json",
-            "sourceHash" : "6f59c4931554a3a59269050eabc675f8c268895f3f10436a97175f4e294e58a1"
+            "sourceHash" : "40441fac77c45979d74dc55ba8314ff901b2a2f60f3c5cbd38d7ea8145a97916"
         },
         "blocks" : [
             {
@@ -506,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x10000000b42a",
-                    "hash" : "0x4ba4a73831db4e80cea45e29f16d878daebc185d474dd85398be8a7036566609",
-                    "mixHash" : "0x44ce72773b54a2b4b44c35a0f47c0c6e04a5720dab606b5baa50f4df9d33b9d5",
-                    "nonce" : "0x79b2f795dee2f575",
+                    "hash" : "0xe6da18cbf66b4aade16c5dcf7be5ea221336e5367399a4d668986d21ab89f824",
+                    "mixHash" : "0x4c7bebec6bb825e892d8095ec7f68b6d670f59bf2aec70f1b40bfc5b1bbee827",
+                    "nonce" : "0x2026d9ee60e138ec",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
                     "receiptTrie" : "0x3c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55",
@@ -517,10 +150,10 @@
                     "transactionsTrie" : "0x25f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba08dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a03c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000b42a8203e880a044ce72773b54a2b4b44c35a0f47c0c6e04a5720dab606b5baa50f4df9d33b9d58879b2f795dee2f575f865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
+                "rlp" : "0xf9026bf90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba08dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076a025f7bdaeea15f5a5ea594146436c514dcfa010d8d1437497e1d85dd128420484a03c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000b42a8203e880a04c7bebec6bb825e892d8095ec7f68b6d670f59bf2aec70f1b40bfc5b1bbee827882026d9ee60e138ecf865f86380018610000000d78894bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca05e2c7af3b9d4bf9a2d424b3f15612c33c55511e57e214ca07e57a7b68e708cb5a0494317f2e30c61735eb351cd078ac0c503abbd1ee544a07ccedabad4d722a57ac0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x10000000d788",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -554,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4ba4a73831db4e80cea45e29f16d878daebc185d474dd85398be8a7036566609",
+        "lastblockhash" : "0xe6da18cbf66b4aade16c5dcf7be5ea221336e5367399a4d668986d21ab89f824",
         "network" : "Homestead",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG_d0g0v0.json
index d0e8a62b1..ef93dc085 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG_d0g0v0.json
@@ -2,10 +2,10 @@
     "Call1024OOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json",
-            "sourceHash" : "5f91a01f9b9411f78fe3db07f6fe8be52755c1e981ed6d4a7b5b1ed8a4ee0fdc"
+            "sourceHash" : "9912a614d11961c4af418e14a446b2818eaa316bff651aca7e94c0c2342702db"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3a8720",
-                    "hash" : "0x468d6c14a0c91a95e274bdea593d002ac1fc26c203604ea8fdb810029d897dfa",
-                    "mixHash" : "0x8ead4f9b91255a12b9566f6407a959fc6c56c37fb94e0dfeb8fb1fb9244a7451",
-                    "nonce" : "0x68388bf2762bc59d",
+                    "hash" : "0x8692642f430b1fd287d5729ef1a5bafd0c29dc202ffd715ecef143d4a183adfb",
+                    "mixHash" : "0x4bd1410d9f588f262ea7b10ed8fa97382d0a0a64448c8e6ab0c162b66536b52c",
+                    "nonce" : "0xc37a1b716e3aad79",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
                     "receiptTrie" : "0x48f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ff",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ed434107e4767362f9114d9d8334503fbbe5995966a6928e22372eed314c5801a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca048f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a08ead4f9b91255a12b9566f6407a959fc6c56c37fb94e0dfeb8fb1fb9244a74518868388bf2762bc59df862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ed434107e4767362f9114d9d8334503fbbe5995966a6928e22372eed314c5801a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca048f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a04bd1410d9f588f262ea7b10ed8fa97382d0a0a64448c8e6ab0c162b66536b52c88c37a1b716e3aad79f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0xefe17a",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x468d6c14a0c91a95e274bdea593d002ac1fc26c203604ea8fdb810029d897dfa",
+        "lastblockhash" : "0x8692642f430b1fd287d5729ef1a5bafd0c29dc202ffd715ecef143d4a183adfb",
         "network" : "Byzantium",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -123,382 +123,13 @@
             }
         }
     },
-    "Call1024OOG_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/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json",
-            "sourceHash" : "5f91a01f9b9411f78fe3db07f6fe8be52755c1e981ed6d4a7b5b1ed8a4ee0fdc"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x3a8720",
-                    "hash" : "0x4cb5f6a27bcd644ae0a65d6ffe939a2f1c2370c6cf5010a9aa5e595d6e91864c",
-                    "mixHash" : "0x02e3c231fd35474bfc59e52d6feaa9e6305fa688a6ea4befdbd2bc1a7f9d5a50",
-                    "nonce" : "0x29990fd01b2045e4",
-                    "number" : "0x01",
-                    "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-                    "receiptTrie" : "0xb951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
-                    "stateRoot" : "0x94df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a002e3c231fd35474bfc59e52d6feaa9e6305fa688a6ea4befdbd2bc1a7f9d5a508829990fd01b2045e4f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0xefe17a",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xdd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176",
-                        "s" : "0x7c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4cb5f6a27bcd644ae0a65d6ffe939a2f1c2370c6cf5010a9aa5e595d6e91864c",
-        "network" : "EIP150",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffc578d5",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182452e8720",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x040a",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x85",
-                    "0x01" : "0x01",
-                    "0x02" : "0x020789"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "Call1024OOG_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/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json",
-            "sourceHash" : "5f91a01f9b9411f78fe3db07f6fe8be52755c1e981ed6d4a7b5b1ed8a4ee0fdc"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x3a8720",
-                    "hash" : "0x22d4d1f289be7d35452da4ab895433ff2105e6ffcb72b951c816a9a9e2eda632",
-                    "mixHash" : "0x72d9a56dddd39753977a1f8c2b07d395059fa406cf536c329665bdd5f5bc50f7",
-                    "nonce" : "0xd40383f191bf3dcc",
-                    "number" : "0x01",
-                    "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-                    "receiptTrie" : "0xb951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
-                    "stateRoot" : "0x94df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a072d9a56dddd39753977a1f8c2b07d395059fa406cf536c329665bdd5f5bc50f788d40383f191bf3dccf862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0xefe17a",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xdd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176",
-                        "s" : "0x7c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x22d4d1f289be7d35452da4ab895433ff2105e6ffcb72b951c816a9a9e2eda632",
-        "network" : "EIP158",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffc578d5",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182452e8720",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x040a",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x85",
-                    "0x01" : "0x01",
-                    "0x02" : "0x020789"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "Call1024OOG_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/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json",
-            "sourceHash" : "5f91a01f9b9411f78fe3db07f6fe8be52755c1e981ed6d4a7b5b1ed8a4ee0fdc"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xefe17a",
-                    "hash" : "0x29948a55effb838618f9dc08b99b8e951c49a1cd85236650a4ee397ba94f1079",
-                    "mixHash" : "0xb49afa0cea7126769c247d2e0063a8d03bc73aa64824ccef194bd313a998a940",
-                    "nonce" : "0xa79d9530ca1975f2",
-                    "number" : "0x01",
-                    "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-                    "receiptTrie" : "0x1ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4",
-                    "stateRoot" : "0xf594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca01ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efe17a8203e880a0b49afa0cea7126769c247d2e0063a8d03bc73aa64824ccef194bd313a998a94088a79d9530ca1975f2f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0xefe17a",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xdd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176",
-                        "s" : "0x7c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x29948a55effb838618f9dc08b99b8e951c49a1cd85236650a4ee397ba94f1079",
-        "network" : "Frontier",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffff101e85",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918245e3e17a",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "Call1024OOG_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/Call1024OOG_d0g0v0Filler.json",
-            "sourceHash" : "5f91a01f9b9411f78fe3db07f6fe8be52755c1e981ed6d4a7b5b1ed8a4ee0fdc"
+            "sourceHash" : "9912a614d11961c4af418e14a446b2818eaa316bff651aca7e94c0c2342702db"
         },
         "blocks" : [
             {
@@ -509,9 +140,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xefd576",
-                    "hash" : "0x8da48a165e14a2ed92ede08d3c567b6c1ea8454b3c5fe851f4c739a5183aa079",
-                    "mixHash" : "0x4981011be75e5a5b08b4472cad549b2a09feeef79792278f21327628112b18a1",
-                    "nonce" : "0xfc2bd59f247f5a03",
+                    "hash" : "0x63209753465882086c75be0da7f1678f0739781619b022522d9140723d10b3a3",
+                    "mixHash" : "0x06559e2dc0cbd658b64378f1d40e814b1e7bd20a325796715e86ca7c8bebc9b8",
+                    "nonce" : "0x11f548990fc675a4",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
                     "receiptTrie" : "0xcdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277",
@@ -520,10 +151,10 @@
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0cdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efd5768203e880a04981011be75e5a5b08b4472cad549b2a09feeef79792278f21327628112b18a188fc2bd59f247f5a03f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0cdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efd5768203e880a006559e2dc0cbd658b64378f1d40e814b1e7bd20a325796715e86ca7c8bebc9b88811f548990fc675a4f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0xefe17a",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -557,7 +188,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8da48a165e14a2ed92ede08d3c567b6c1ea8454b3c5fe851f4c739a5183aa079",
+        "lastblockhash" : "0x63209753465882086c75be0da7f1678f0739781619b022522d9140723d10b3a3",
         "network" : "Homestead",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0.json
index 1fd364be6..ed284c9c3 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0.json
@@ -2,10 +2,10 @@
     "Call1024PreCalls_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json",
-            "sourceHash" : "f5443dc7657702a3d993fe9516b76b8da6d34dc69461b5d29ca8d3e2181fb2f9"
+            "sourceHash" : "f12d4936e9b60aa68a1e5297f9fe849e8b001a89e751f948d50e9dab0006f2bc"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x022d79b7",
-                    "hash" : "0x22b2cb43b673de39bb1972105c314563710ebb234162d3d6b416d37ee4b44f1d",
-                    "mixHash" : "0x675e5261c9c00f09b012fe40501c2cbe4824c757f7de942b8c520f885124dfd9",
-                    "nonce" : "0x24e240f8ff7f20e6",
+                    "hash" : "0xdb7cea5af36d519daa6502b4dba786a2cdcd8c99795378a7fff0e8b1787e888c",
+                    "mixHash" : "0x7167139f06f419ceb271dc0d0bb350b9376ae1172751b2078a03c0d281a38a28",
+                    "nonce" : "0x324d8d8c0a6f300a",
                     "number" : "0x01",
                     "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
                     "receiptTrie" : "0xacd667ce16049214939dde27878067f64f9e7422afcbc9440bb489df80c858fd",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0946d5aff549116a10e4c18c76f0279a4223545c125578ac7281a26c48b3aaedaa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0acd667ce16049214939dde27878067f64f9e7422afcbc9440bb489df80c858fdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a0675e5261c9c00f09b012fe40501c2cbe4824c757f7de942b8c520f885124dfd98824e240f8ff7f20e6f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0946d5aff549116a10e4c18c76f0279a4223545c125578ac7281a26c48b3aaedaa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0acd667ce16049214939dde27878067f64f9e7422afcbc9440bb489df80c858fdb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a07167139f06f419ceb271dc0d0bb350b9376ae1172751b2078a03c0d281a38a2888324d8d8c0a6f300af867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x22b2cb43b673de39bb1972105c314563710ebb234162d3d6b416d37ee4b44f1d",
+        "lastblockhash" : "0xdb7cea5af36d519daa6502b4dba786a2cdcd8c99795378a7fff0e8b1787e888c",
         "network" : "Byzantium",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -124,384 +124,13 @@
             }
         }
     },
-    "Call1024PreCalls_d0g0v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json",
-            "sourceHash" : "f5443dc7657702a3d993fe9516b76b8da6d34dc69461b5d29ca8d3e2181fb2f9"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x022d79b7",
-                    "hash" : "0x141b041c39b1f65ce33e9eb29833e46ae8d2c7dc4512e8c546809eabd5cfaca0",
-                    "mixHash" : "0xde8d5ccec4e051a8546fdc4a3d896536bd4897b487cd2736c1cc68a4c86e9061",
-                    "nonce" : "0x4d4b0f636c448824",
-                    "number" : "0x01",
-                    "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
-                    "receiptTrie" : "0xb48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85a",
-                    "stateRoot" : "0x722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085a",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085aa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0b48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a0de8d5ccec4e051a8546fdc4a3d896536bd4897b487cd2736c1cc68a4c86e9061884d4b0f636c448824f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x7ffffffffffffff0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
-                        "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bb",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x141b041c39b1f65ce33e9eb29833e46ae8d2c7dc4512e8c546809eabd5cfaca0",
-        "network" : "EIP150",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0ffffffffffffffffffffffffffdd2863e",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2320",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182472179b7",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2a",
-                "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff1600355600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x03e4",
-                    "0x01" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x07e8",
-                "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff1600355600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "Call1024PreCalls_d0g0v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json",
-            "sourceHash" : "f5443dc7657702a3d993fe9516b76b8da6d34dc69461b5d29ca8d3e2181fb2f9"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x022d79b7",
-                    "hash" : "0xb087a72eb06f1ffab5aa60da78672894c72a69ced5bf24ee3bd9277ec58b67ea",
-                    "mixHash" : "0x478ad451666a594ac1eacc270dacd12bcdb6acd66ae522ea1ca439461d1000d5",
-                    "nonce" : "0x248fd2a5796f6d65",
-                    "number" : "0x01",
-                    "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
-                    "receiptTrie" : "0xb48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85a",
-                    "stateRoot" : "0x722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085a",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026bf901fea06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0722469d12f134e6e2727b66f02983df6b821bcdc5bc0ef5a56fb65aec112085aa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0b48da4588dc8c14d2a05ca88d5e33f23bde262176aeb8d5cb551f16f44a6a85ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff84022d79b78203e880a0478ad451666a594ac1eacc270dacd12bcdb6acd66ae522ea1ca439461d1000d588248fd2a5796f6d65f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x7ffffffffffffff0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
-                        "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bb",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb087a72eb06f1ffab5aa60da78672894c72a69ced5bf24ee3bd9277ec58b67ea",
-        "network" : "EIP158",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0ffffffffffffffffffffffffffdd2863e",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2320",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182472179b7",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2a",
-                "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff1600355600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x03e4",
-                    "0x01" : "0x01",
-                    "0x02" : "0x01",
-                    "0x03" : "0x01"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x07e8",
-                "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff1600355600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "Call1024PreCalls_d0g0v0_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json",
-            "sourceHash" : "f5443dc7657702a3d993fe9516b76b8da6d34dc69461b5d29ca8d3e2181fb2f9"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x7ffffffffffffff0",
-                    "hash" : "0x33bb877cb5093fceb9241cd1da90c7ed4c63b669fd2814a608d69e7e72a12ae0",
-                    "mixHash" : "0x3d649c81fd2bff472fec8dafd7fc95892e62dbd1cef2e9b0b9e8fc5c2af699b5",
-                    "nonce" : "0x210b74f593040b52",
-                    "number" : "0x01",
-                    "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
-                    "receiptTrie" : "0x1d5065ec1aa8be6f63d194b14ec56347fa8154a8583715606c37c95ed7da362b",
-                    "stateRoot" : "0xccbd71beff2e1b600c4e00a5169d4a2b17b15e36cff0ce49b3401586b08be0f1",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026ff90202a06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ccbd71beff2e1b600c4e00a5169d4a2b17b15e36cff0ce49b3401586b08be0f1a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa01d5065ec1aa8be6f63d194b14ec56347fa8154a8583715606c37c95ed7da362bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a03d649c81fd2bff472fec8dafd7fc95892e62dbd1cef2e9b0b9e8fc5c2af699b588210b74f593040b52f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x7ffffffffffffff0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
-                        "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bb",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x33bb877cb5093fceb9241cd1da90c7ed4c63b669fd2814a608d69e7e72a12ae0",
-        "network" : "Frontier",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fffffffffffffffff800000000000000f",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xc563918244f3fff0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x07e8",
-                "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff1600355600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x07e8",
-                "code" : "0x6000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff16002556000600060006000600173aaaf5374fce5edbc8e2a8697c15331677e6ebf0b61fffff1600355600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "Call1024PreCalls_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/Call1024PreCalls_d0g0v0Filler.json",
-            "sourceHash" : "f5443dc7657702a3d993fe9516b76b8da6d34dc69461b5d29ca8d3e2181fb2f9"
+            "sourceHash" : "f12d4936e9b60aa68a1e5297f9fe849e8b001a89e751f948d50e9dab0006f2bc"
         },
         "blocks" : [
             {
@@ -512,9 +141,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x100000018542",
-                    "hash" : "0xb67435adc0b787309599994519577df97573f0635495d25e0c52dbfb1bc64ac0",
-                    "mixHash" : "0xd2b5108f53bb71a94f32e2e6f15381e9576e2d404a781bcafb03b150ff649042",
-                    "nonce" : "0x19eaea579935447e",
+                    "hash" : "0x356785bc28f5276a616eb63bdeb3638f8b45d25779a45dea010523549ff80eb0",
+                    "mixHash" : "0x116bd52be84fc3af2ca361d1f52d7de7abb426a0e437957c809d3c096812228c",
+                    "nonce" : "0x3350446a67119b97",
                     "number" : "0x01",
                     "parentHash" : "0x6fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76",
                     "receiptTrie" : "0x0e0169b3cb29f17c1d9359d16cc4ac807c3604447925ba91743a5f41d71f034d",
@@ -523,10 +152,10 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026df90200a06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d4fa6e77852836c736caef0508641587771f1145f64ea6f4e1028004ad819b25a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa00e0169b3cb29f17c1d9359d16cc4ac807c3604447925ba91743a5f41d71f034db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff861000000185428203e880a0d2b5108f53bb71a94f32e2e6f15381e9576e2d404a781bcafb03b150ff6490428819eaea579935447ef867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026df90200a06fe271d3a1696aff704b5ae0f19f3dd28a469c08f81b985946c2a84427cccf76a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0d4fa6e77852836c736caef0508641587771f1145f64ea6f4e1028004ad819b25a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa00e0169b3cb29f17c1d9359d16cc4ac807c3604447925ba91743a5f41d71f034db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff861000000185428203e880a0116bd52be84fc3af2ca361d1f52d7de7abb426a0e437957c809d3c096812228c883350446a67119b97f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -560,7 +189,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ac8f83f2eb11169e06ff722c10e6c2a98f025aaa12987ede15e951f185c3e0bba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb67435adc0b787309599994519577df97573f0635495d25e0c52dbfb1bc64ac0",
+        "lastblockhash" : "0x356785bc28f5276a616eb63bdeb3638f8b45d25779a45dea010523549ff80eb0",
         "network" : "Homestead",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0.json
index 8836655b7..e04b5f1c5 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0.json
@@ -2,10 +2,10 @@
     "CallLoseGasOOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "68a32a520f6fbbb17b693d0b6cb602520a751cc747e6af17ec943bd19186c94a"
+            "sourceHash" : "a1af2f4bba24171ee26797b93f74d25cc42c050f7045f419f18d187dbe5acbee"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028dc8",
-                    "hash" : "0x157b6ee2d87b7dcb172bfd5c78002b09603b3ef912c34eab47b1d106d5433b99",
-                    "mixHash" : "0xee7410deb5a209de95e9e1ff340c8161574adecc7890bf50f55fcabd70b4f4dc",
-                    "nonce" : "0xef1dea0d3cf9f15d",
+                    "hash" : "0x34501928e4a84b84250a20b208fc1582ba2ac452a16a1acbff1dfb5163500015",
+                    "mixHash" : "0xe882e4bf8ddbddbcec733b11d5717c347d34667745ed50961a0275e7b2aad8a2",
+                    "nonce" : "0x358b70f5bf75aec7",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0x69d3ceff06b3816326e0de803572e501f9cb4ab92755f8eaf7b680bcc0fb0eba",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f69e8ea6e0da5c9be3eb9fbde338cc1a7157774168d4fcf626aab764259fad5ea05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa069d3ceff06b3816326e0de803572e501f9cb4ab92755f8eaf7b680bcc0fb0ebab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a0ee7410deb5a209de95e9e1ff340c8161574adecc7890bf50f55fcabd70b4f4dc88ef1dea0d3cf9f15df867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f69e8ea6e0da5c9be3eb9fbde338cc1a7157774168d4fcf626aab764259fad5ea05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa069d3ceff06b3816326e0de803572e501f9cb4ab92755f8eaf7b680bcc0fb0ebab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a0e882e4bf8ddbddbcec733b11d5717c347d34667745ed50961a0275e7b2aad8a288358b70f5bf75aec7f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x157b6ee2d87b7dcb172bfd5c78002b09603b3ef912c34eab47b1d106d5433b99",
+        "lastblockhash" : "0x34501928e4a84b84250a20b208fc1582ba2ac452a16a1acbff1dfb5163500015",
         "network" : "Byzantium",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -122,380 +122,13 @@
             }
         }
     },
-    "CallLoseGasOOG_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/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "68a32a520f6fbbb17b693d0b6cb602520a751cc747e6af17ec943bd19186c94a"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x028dc8",
-                    "hash" : "0x54792a3ffbd15533abfdd5108b70db934646389c4b65cefa5f2d3a0e6210aadf",
-                    "mixHash" : "0x1c9d6ba022e2dd7c6dd6ca90d6f42a9b93351f2a982950548e6019acbc832cc5",
-                    "nonce" : "0xee1cdf65f6138c35",
-                    "number" : "0x01",
-                    "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-                    "receiptTrie" : "0x7031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719f",
-                    "stateRoot" : "0x21515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ff",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba021515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa07031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a01c9d6ba022e2dd7c6dd6ca90d6f42a9b93351f2a982950548e6019acbc832cc588ee1cdf65f6138c35f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x7ffffffffffffff0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
-                        "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06c",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x54792a3ffbd15533abfdd5108b70db934646389c4b65cefa5f2d3a0e6210aadf",
-        "network" : "EIP150",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xfffffffffffffffffffffffffffd722d",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918244f68dc8",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x040a",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x02" : "0x03e9"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "CallLoseGasOOG_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/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "68a32a520f6fbbb17b693d0b6cb602520a751cc747e6af17ec943bd19186c94a"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x028dc8",
-                    "hash" : "0x50c501b8932c0827343a7cebfc12c1e40d9c27ff45ba10e50e6e415d9218119c",
-                    "mixHash" : "0xe5117d97dfd01a5a8707fb534b6be8b07826a2fcbb386073b9ad588449f5ab03",
-                    "nonce" : "0x80e3825b917bec34",
-                    "number" : "0x01",
-                    "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-                    "receiptTrie" : "0x7031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719f",
-                    "stateRoot" : "0x21515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ff",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba021515dbe0529ce8ac5dfc57b6c50808fe8eae32076dfe89d62928c4c96cdd1ffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa07031e5ab94522f307f122d38a61c9ffbea18e1abbe9a1c347a0a1c879c7d719fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83028dc88203e880a0e5117d97dfd01a5a8707fb534b6be8b07826a2fcbb386073b9ad588449f5ab038880e3825b917bec34f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x7ffffffffffffff0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
-                        "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06c",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x50c501b8932c0827343a7cebfc12c1e40d9c27ff45ba10e50e6e415d9218119c",
-        "network" : "EIP158",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xfffffffffffffffffffffffffffd722d",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918244f68dc8",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x040a",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x02" : "0x03e9"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "CallLoseGasOOG_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/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "68a32a520f6fbbb17b693d0b6cb602520a751cc747e6af17ec943bd19186c94a"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x7ffffffffffffff0",
-                    "hash" : "0x0f06498003f9d0e19b76043c68c7954a96ba0eb25c6a9289ebf09bac093fb8a0",
-                    "mixHash" : "0xeba528e4204fc79eef6b3ec11a130b193d55b7d6eb06d1bb18d4c114dab67ea3",
-                    "nonce" : "0xc5fa2a14073aef6e",
-                    "number" : "0x01",
-                    "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-                    "receiptTrie" : "0xf139ad126bf30b2b47f7eccfc9f50f8898b3fd0c80069944b9dcab8ab86aa7c8",
-                    "stateRoot" : "0xe2df3e04aae03dfc6ced1b29fc04f02f581e5363f5a5ed3892b3d52bc72d200c",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026ff90202a0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0e2df3e04aae03dfc6ced1b29fc04f02f581e5363f5a5ed3892b3d52bc72d200ca05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0f139ad126bf30b2b47f7eccfc9f50f8898b3fd0c80069944b9dcab8ab86aa7c8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a0eba528e4204fc79eef6b3ec11a130b193d55b7d6eb06d1bb18d4c114dab67ea388c5fa2a14073aef6ef867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x7ffffffffffffff0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
-                        "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06c",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0f06498003f9d0e19b76043c68c7954a96ba0eb25c6a9289ebf09bac093fb8a0",
-        "network" : "Frontier",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffff800000000000000f",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xc563918244f3fff0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "CallLoseGasOOG_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/CallLoseGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "68a32a520f6fbbb17b693d0b6cb602520a751cc747e6af17ec943bd19186c94a"
+            "sourceHash" : "a1af2f4bba24171ee26797b93f74d25cc42c050f7045f419f18d187dbe5acbee"
         },
         "blocks" : [
             {
@@ -506,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028972",
-                    "hash" : "0xd23c470e96ab17c13f327a6d4cfacfd1e8be20e80537e514e298099d8cd282f6",
-                    "mixHash" : "0x66d04e6d5a3c71f50f17e00029117ec5d103f21500daf20857d7d12769216c00",
-                    "nonce" : "0x69b93e55d4558bbc",
+                    "hash" : "0xbf7c398bf1417aeed43bb98f7dde8dd6c579a8d85b439a1ae4e57e1d517d18bf",
+                    "mixHash" : "0x02249194a8ab62211ebf42f304549f6012fdccd405bd1d0ba8db2db392cdb87c",
+                    "nonce" : "0x4daeb44454c1efaf",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0x55ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055e",
@@ -517,10 +150,10 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7fa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa055ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289728203e880a066d04e6d5a3c71f50f17e00029117ec5d103f21500daf20857d7d12769216c008869b93e55d4558bbcf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7fa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa055ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289728203e880a002249194a8ab62211ebf42f304549f6012fdccd405bd1d0ba8db2db392cdb87c884daeb44454c1efaff867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -554,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd23c470e96ab17c13f327a6d4cfacfd1e8be20e80537e514e298099d8cd282f6",
+        "lastblockhash" : "0xbf7c398bf1417aeed43bb98f7dde8dd6c579a8d85b439a1ae4e57e1d517d18bf",
         "network" : "Homestead",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0.json
index a64475cfc..b077914b7 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0.json
@@ -2,10 +2,10 @@
     "CallRecursiveBombPreCall_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json",
-            "sourceHash" : "a4bb976108b7d613bf0b68d86c5ebdcfe58e1e112faef562803a2ef6e0dcb1b4"
+            "sourceHash" : "13581ff7b69678e1816c87dff8de16c1709bfd8000898aad191156e6a00eb5c6"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xacb1dd",
-                    "hash" : "0xac3569815f8a3583755c1d82d638d5bdb40fcf0d8d5f0ed4cba5b3d02cd9779b",
-                    "mixHash" : "0x8e4476b0d66a7b4877f6585f3d3121566772966298f3063592fffd5d3ab02325",
-                    "nonce" : "0xb395b4193114a9f3",
+                    "hash" : "0x1b50d9afadd35cd4ad4283bfbcd587aa06b245a2a34d41312d28b3883a1ba79d",
+                    "mixHash" : "0xc420021a0fcbd4ccf15c9012a6bbfb21688ff29a0b516ecda96c6975d3b9fe35",
+                    "nonce" : "0x72eaadbbfb30b277",
                     "number" : "0x01",
                     "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
                     "receiptTrie" : "0x3f3881c24d41018b9efd714e1fadd55085e20e0287de75f4e1e6a853077e7961",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fdcc751f7828f91757b04e3ab07248f2a94147ac2f7693828b5bd6a588395715a0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a03f3881c24d41018b9efd714e1fadd55085e20e0287de75f4e1e6a853077e7961b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a08e4476b0d66a7b4877f6585f3d3121566772966298f3063592fffd5d3ab0232588b395b4193114a9f3f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
+                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0fdcc751f7828f91757b04e3ab07248f2a94147ac2f7693828b5bd6a588395715a0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a03f3881c24d41018b9efd714e1fadd55085e20e0287de75f4e1e6a853077e7961b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a0c420021a0fcbd4ccf15c9012a6bbfb21688ff29a0b516ecda96c6975d3b9fe358872eaadbbfb30b277f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xac3569815f8a3583755c1d82d638d5bdb40fcf0d8d5f0ed4cba5b3d02cd9779b",
+        "lastblockhash" : "0x1b50d9afadd35cd4ad4283bfbcd587aa06b245a2a34d41312d28b3883a1ba79d",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -131,398 +131,13 @@
             }
         }
     },
-    "CallRecursiveBombPreCall_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/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json",
-            "sourceHash" : "a4bb976108b7d613bf0b68d86c5ebdcfe58e1e112faef562803a2ef6e0dcb1b4"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xacb1dd",
-                    "hash" : "0x296de8529dbbdf4fff4cb209da7e841d1e7d782e88d4cc3433dfbe862da019ef",
-                    "mixHash" : "0x9775755ebfbc5cadb25a00f8f6fffcf63b31acf1732b0c1cf446fb887eee4cce",
-                    "nonce" : "0xf8b24facece3649c",
-                    "number" : "0x01",
-                    "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
-                    "receiptTrie" : "0xde1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991",
-                    "stateRoot" : "0x10b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0f",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0fa0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a0de1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a09775755ebfbc5cadb25a00f8f6fffcf63b31acf1732b0c1cf446fb887eee4cce88f8b24facece3649cf867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x7ffffffffffffff0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x8503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816",
-                        "s" : "0x39d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x86e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x296de8529dbbdf4fff4cb209da7e841d1e7d782e88d4cc3433dfbe862da019ef",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0fffffffffffffffffffffffffffffe8",
-                "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f150600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff4",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918245a0b1dd",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600054016000556000600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b562036b005a03f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x03ff",
-                    "0x01" : "0x01"
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fffffffffffffffffffffffff534e22",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xbad304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0fffffffffffffffffffffffffffffff",
-                "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f150600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff4",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600054016000556000600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b562036b005a03f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "CallRecursiveBombPreCall_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/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json",
-            "sourceHash" : "a4bb976108b7d613bf0b68d86c5ebdcfe58e1e112faef562803a2ef6e0dcb1b4"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xacb1dd",
-                    "hash" : "0x43bb5e78d268f2de37e65abe8a6d7d3bbad72a99813e7d6a4a3d3da9ff852a2f",
-                    "mixHash" : "0xe32d686c78561f8a41d92195f5270d242b3c855eb2c7b423957ec29080571ad0",
-                    "nonce" : "0x19e5909b35fdc81e",
-                    "number" : "0x01",
-                    "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
-                    "receiptTrie" : "0xde1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991",
-                    "stateRoot" : "0x10b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0f",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa010b0d451164f1a7742b47881f87d98fc52ccea99fa559db209242f6fff58dd0fa0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a0de1d162c863223029ac790b7359349053e49d7bbda0b347689de34439abc2991b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83acb1dd8203e880a0e32d686c78561f8a41d92195f5270d242b3c855eb2c7b423957ec29080571ad08819e5909b35fdc81ef867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x7ffffffffffffff0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x8503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816",
-                        "s" : "0x39d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x86e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x43bb5e78d268f2de37e65abe8a6d7d3bbad72a99813e7d6a4a3d3da9ff852a2f",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0fffffffffffffffffffffffffffffe8",
-                "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f150600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff4",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918245a0b1dd",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600054016000556000600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b562036b005a03f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x03ff",
-                    "0x01" : "0x01"
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fffffffffffffffffffffffff534e22",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xbad304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0fffffffffffffffffffffffffffffff",
-                "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f150600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff4",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600054016000556000600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b562036b005a03f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "CallRecursiveBombPreCall_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/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json",
-            "sourceHash" : "a4bb976108b7d613bf0b68d86c5ebdcfe58e1e112faef562803a2ef6e0dcb1b4"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x7ffffffffffffff0",
-                    "hash" : "0x0d8912483c896632da9ffc063e58856f8f59a7a63a3472d5a1d94766aa1ec6aa",
-                    "mixHash" : "0xf8b883eb52e382dfa495df948ddbf36328c952786e667711736c4d4f776df444",
-                    "nonce" : "0x7d74734488fe61d2",
-                    "number" : "0x01",
-                    "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
-                    "receiptTrie" : "0x7cff0679152936a546edfa298f0a03856153210dfa9f5309ddff3255e754439e",
-                    "stateRoot" : "0xbc6fe1ee17f92887e71da1d4448c5e8ef52beb2bf8a3fb0757dcec69496a834d",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026ff90202a05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bc6fe1ee17f92887e71da1d4448c5e8ef52beb2bf8a3fb0757dcec69496a834da0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a07cff0679152936a546edfa298f0a03856153210dfa9f5309ddff3255e754439eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a0f8b883eb52e382dfa495df948ddbf36328c952786e667711736c4d4f776df444887d74734488fe61d2f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x7ffffffffffffff0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x8503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816",
-                        "s" : "0x39d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x86e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0d8912483c896632da9ffc063e58856f8f59a7a63a3472d5a1d94766aa1ec6aa",
-        "network" : "Frontier",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0fffffffffffffffffffffffffffffff",
-                "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f150600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff4",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0xc563918244f3fff0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600054016000556000600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b562036b005a03f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fffffffffffffff800000000000000f",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0fffffffffffffffffffffffffffffff",
-                "code" : "0x6000600060006000601773bad304eb96065b2a98b57a48a06ae28d285a71b5620186a0f150600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b56707fffffffffffffff4",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600054016000556000600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b562036b005a03f1600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0fffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "CallRecursiveBombPreCall_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/CallRecursiveBombPreCall_d0g0v0Filler.json",
-            "sourceHash" : "a4bb976108b7d613bf0b68d86c5ebdcfe58e1e112faef562803a2ef6e0dcb1b4"
+            "sourceHash" : "13581ff7b69678e1816c87dff8de16c1709bfd8000898aad191156e6a00eb5c6"
         },
         "blocks" : [
             {
@@ -533,9 +148,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xa004b5",
-                    "hash" : "0x9aa1e6955c44030194961690304cf11401c59af1900073e6ee382e26fe8d555b",
-                    "mixHash" : "0xfbab86f677271b8503f1429e28e8f92658745e941c4bf508c17f8726a99468e3",
-                    "nonce" : "0x67befba893260089",
+                    "hash" : "0x51cec6de75ac47c1ac10975bd39dbea30ba9d944ac7077924ac91419f3070bab",
+                    "mixHash" : "0xb19a8e9b5c8b60ae1868662fb6a8f453c63ff120dad2cbf5edb738350770b5d6",
+                    "nonce" : "0x3f6022adde85fad1",
                     "number" : "0x01",
                     "parentHash" : "0x5cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9b",
                     "receiptTrie" : "0x7df681a2c9e9f6bf1daddcef792d2c0df7c6df08ef42633c034f7344c465ebf9",
@@ -544,10 +159,10 @@
                     "transactionsTrie" : "0xe81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0133f22883dfd6502eaf4aa724b75a9076d3e43814917532a9a4533ca360857e5a0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a07df681a2c9e9f6bf1daddcef792d2c0df7c6df08ef42633c034f7344c465ebf9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83a004b58203e880a0fbab86f677271b8503f1429e28e8f92658745e941c4bf508c17f8726a99468e38867befba893260089f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
+                "rlp" : "0xf9026af901fda05cb567c6920882f32325bb90fab62dc44eea8add60ec75b2a769083468f1ae9ba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0133f22883dfd6502eaf4aa724b75a9076d3e43814917532a9a4533ca360857e5a0e81f46fee71eec9b5eb9d3c09d857fe133fd8ea6582440d8c184804d4ef864a9a07df681a2c9e9f6bf1daddcef792d2c0df7c6df08ef42633c034f7344c465ebf9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83a004b58203e880a0b19a8e9b5c8b60ae1868662fb6a8f453c63ff120dad2cbf5edb738350770b5d6883f6022adde85fad1f867f8658001887ffffffffffffff094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ca08503ee9dc6d31d42de8457475bf2ab1ebedf4ce7cae9e37d03a7af523012d816a039d25114f6bb11240492c0818ad9cbbd95339520e15ecf4bd6dfd475b2121196c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -581,7 +196,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa086e0ae5210840a583104458d1f33ca3dd75f7afb344a8c4764d682ee1ce1de69a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9aa1e6955c44030194961690304cf11401c59af1900073e6ee382e26fe8d555b",
+        "lastblockhash" : "0x51cec6de75ac47c1ac10975bd39dbea30ba9d944ac7077924ac91419f3070bab",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0.json
index 132fdacf3..0b5616584 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0.json
@@ -2,10 +2,10 @@
     "CallcodeLoseGasOOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "42ef77087af7612e9934e59aa083440a6d5dec3ced0511df0de051cc740f76ca"
+            "sourceHash" : "cbc02a8dbc4fcb62dacba965e8e0fa580814be93895d3907555c0b3b9c7fcd95"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028976",
-                    "hash" : "0x71e3dbb2943cb304e063ef34f316c9238e8358d723e2c8b0f27c55ad264a529d",
-                    "mixHash" : "0xcf4f36447d1b11869a6247ab8c25b3bb38f5312a6ab0db5d02481bb9623f9a9a",
-                    "nonce" : "0x95b74c1eadfdcb57",
+                    "hash" : "0xb7ade4c70ff74323c12ea6e1c43c5df29ff03d15fe3d1e70620b4cf792f6527e",
+                    "mixHash" : "0x4cee9d4318eac9367d7cbdb49fe9418ccfc21a236aaa185a62bf0bf87c525b66",
+                    "nonce" : "0xe4188f010c1e0e6d",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0x714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61ab",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0fd07983948c9ace7e88a6a4a7ec903763627a879638c1578a16e2afa37a87e57a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a0714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61abb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a0cf4f36447d1b11869a6247ab8c25b3bb38f5312a6ab0db5d02481bb9623f9a9a8895b74c1eadfdcb57f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0fd07983948c9ace7e88a6a4a7ec903763627a879638c1578a16e2afa37a87e57a0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a0714b0110d8b76b59fb269d77acb37c1ed6943cca7b0dab5f8576ffc1d1ac61abb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a04cee9d4318eac9367d7cbdb49fe9418ccfc21a236aaa185a62bf0bf87c525b6688e4188f010c1e0e6df862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x028976",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x71e3dbb2943cb304e063ef34f316c9238e8358d723e2c8b0f27c55ad264a529d",
+        "lastblockhash" : "0xb7ade4c70ff74323c12ea6e1c43c5df29ff03d15fe3d1e70620b4cf792f6527e",
         "network" : "Byzantium",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -120,255 +120,13 @@
             }
         }
     },
-    "CallcodeLoseGasOOG_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/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "42ef77087af7612e9934e59aa083440a6d5dec3ced0511df0de051cc740f76ca"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x028976",
-                    "hash" : "0x31952804e5873420555f8cde15672016497a098f580aa942d9b2cbad2f0e0139",
-                    "mixHash" : "0xaec90d4d2bca244b7c8aca3603d25f53e642f06f4bb9e9dfddc4e7dfc698d08c",
-                    "nonce" : "0xde22fdf20a2a00f0",
-                    "number" : "0x01",
-                    "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-                    "receiptTrie" : "0x9fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aa",
-                    "stateRoot" : "0x367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfa",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a0aec90d4d2bca244b7c8aca3603d25f53e642f06f4bb9e9dfddc4e7dfc698d08c88de22fdf20a2a00f0f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x028976",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xcd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7f",
-                        "s" : "0x06d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1b",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06c",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x31952804e5873420555f8cde15672016497a098f580aa942d9b2cbad2f0e0139",
-        "network" : "EIP150",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xfffffffffffffffffffffffffffd7689",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918244f68976",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "CallcodeLoseGasOOG_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/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "42ef77087af7612e9934e59aa083440a6d5dec3ced0511df0de051cc740f76ca"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x028976",
-                    "hash" : "0x6f8a5a95ba2576def6efd72506610bc1c2d7bab5f655557c862a2d0e4fa364e0",
-                    "mixHash" : "0xa7e0f9421dbf65d391e241dab7160c6589ed5849e35f86c4c644a1c33a06bc3f",
-                    "nonce" : "0x1df752d26dfcfdc4",
-                    "number" : "0x01",
-                    "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-                    "receiptTrie" : "0x9fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aa",
-                    "stateRoot" : "0x367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfa",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a0a7e0f9421dbf65d391e241dab7160c6589ed5849e35f86c4c644a1c33a06bc3f881df752d26dfcfdc4f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x028976",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xcd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7f",
-                        "s" : "0x06d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1b",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06c",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6f8a5a95ba2576def6efd72506610bc1c2d7bab5f655557c862a2d0e4fa364e0",
-        "network" : "EIP158",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xfffffffffffffffffffffffffffd7689",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918244f68976",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b620186a060005402600101f46001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "CallcodeLoseGasOOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "42ef77087af7612e9934e59aa083440a6d5dec3ced0511df0de051cc740f76ca"
+            "sourceHash" : "cbc02a8dbc4fcb62dacba965e8e0fa580814be93895d3907555c0b3b9c7fcd95"
         },
         "blocks" : [
             {
@@ -379,9 +137,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028976",
-                    "hash" : "0x063890c2ca79acdc940e73c1cfbd59c05fdf01cdb83611fa31603e8c186f3646",
-                    "mixHash" : "0x04076f57cca6069697b89a09f496c74505edfa2a45b960316d5435cd309773e1",
-                    "nonce" : "0x298bd6d66d9503f6",
+                    "hash" : "0x96277eaa4fe2b4a35c3b189afd38a50e6694c527bb1ed08f2bc8b1a4059e6efd",
+                    "mixHash" : "0x55526047d005fe63e1c0ea1120c6838fe1371d18939162a08d46afe0f7f4beb3",
+                    "nonce" : "0x254d4d707ccf3ab4",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0x9fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aa",
@@ -390,10 +148,10 @@
                     "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a004076f57cca6069697b89a09f496c74505edfa2a45b960316d5435cd309773e188298bd6d66d9503f6f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0367f3a9d591b08a1112a739fa0d6c1d9b572980064ba431cce467f85e80e1dfaa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a09fbfb95c6a9978d5b1037e5494736fed43f00f104824c015bb32830bace351aab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289768203e880a055526047d005fe63e1c0ea1120c6838fe1371d18939162a08d46afe0f7f4beb388254d4d707ccf3ab4f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x028976",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -427,7 +185,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x063890c2ca79acdc940e73c1cfbd59c05fdf01cdb83611fa31603e8c186f3646",
+        "lastblockhash" : "0x96277eaa4fe2b4a35c3b189afd38a50e6694c527bb1ed08f2bc8b1a4059e6efd",
         "network" : "Frontier",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -486,10 +244,10 @@
     "CallcodeLoseGasOOG_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/CallcodeLoseGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "42ef77087af7612e9934e59aa083440a6d5dec3ced0511df0de051cc740f76ca"
+            "sourceHash" : "cbc02a8dbc4fcb62dacba965e8e0fa580814be93895d3907555c0b3b9c7fcd95"
         },
         "blocks" : [
             {
@@ -500,9 +258,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x028972",
-                    "hash" : "0x59dad72c8bef27d087650f8e1cd1a8ef24da9004d73cb40e626224aeb54e0493",
-                    "mixHash" : "0x485353dea6d1c17b9560e2a0301ca4daad151d2b32f78b4c865b304f7b3e2ff5",
-                    "nonce" : "0xcdb49861e991a921",
+                    "hash" : "0x85e6678641ccd30779201b22d60ef892177c70738749cdccd195ecca058d3933",
+                    "mixHash" : "0x37b66df9c7e3f72dbaa9858fe058510b0c3345ff941f6cb46ab56e40d3d49ac8",
+                    "nonce" : "0xdc4214f4f5b8725e",
                     "number" : "0x01",
                     "parentHash" : "0x291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134",
                     "receiptTrie" : "0x55ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055e",
@@ -511,10 +269,10 @@
                     "transactionsTrie" : "0x930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7fa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a055ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289728203e880a0485353dea6d1c17b9560e2a0301ca4daad151d2b32f78b4c865b304f7b3e2ff588cdb49861e991a921f862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
+                "rlp" : "0xf90265f901fda0291344a889111a114e7b95c072b4d01e0d5dc97ca34f1799f1b76a2428915134a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f3dc0ac9e459b1710f520f0437e96baf2f705fc361308178309fa76d1ed83b7fa0930b96e51a2ecd5435a7297b94143f9d14526ce3aac5667bb06c29b263b34511a055ae93aff0c2fb0d83c3dba3b7bd94ba3c2af35ab1068eb522758444395c055eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff830289728203e880a037b66df9c7e3f72dbaa9858fe058510b0c3345ff941f6cb46ab56e40d3d49ac888dc4214f4f5b8725ef862f86080018302897694bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ba0cd600f2ae2ff3787336c74911d1d25e053b81ae72dd849703c712558be496f7fa006d28736b0f78feb5c662d1fd09efcda95a090c2df24897cbbecd3c993bbf316c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x028976",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -548,7 +306,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0433bc29f28e2e14afe21908debf417812fe2d4a2708e644c651b3c0ce7f5c06ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x59dad72c8bef27d087650f8e1cd1a8ef24da9004d73cb40e626224aeb54e0493",
+        "lastblockhash" : "0x85e6678641ccd30779201b22d60ef892177c70738749cdccd195ecca058d3933",
         "network" : "Homestead",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0.json
index fcdf21f97..d90674db6 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0.json
@@ -2,10 +2,10 @@
     "Delegatecall1024OOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json",
-            "sourceHash" : "1ff4004f31ee130024bd3a1ee1234e9785d2115fa7448815ca6462616c5b557d"
+            "sourceHash" : "42dfc4da9c81bd2f0b8f44a710a7217ecba20c5c70230f3be093f99c50abd8f0"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3a8720",
-                    "hash" : "0xda1aaef16d70f43be894ea2007d54e9b8292b6c7ccb72b8a72a034bb26e6a863",
-                    "mixHash" : "0x3d43d1e34b66b9fc9a3c01d4f4326ec1f776d8b28cf55133b02143b9cd3e9299",
-                    "nonce" : "0xccd7fad23f94aeaa",
+                    "hash" : "0x0bc8934429f493cb2e4b9b612c9bd8da3718a4fac217b1488536fd6810d8c5a4",
+                    "mixHash" : "0x112cff95349f8cfdcd33f56a54d3cef855cff4c816134f214a64779a9a5c5771",
+                    "nonce" : "0x5cea96c6955a8a21",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
                     "receiptTrie" : "0x48f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ff",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ed434107e4767362f9114d9d8334503fbbe5995966a6928e22372eed314c5801a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca048f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a03d43d1e34b66b9fc9a3c01d4f4326ec1f776d8b28cf55133b02143b9cd3e929988ccd7fad23f94aeaaf862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ed434107e4767362f9114d9d8334503fbbe5995966a6928e22372eed314c5801a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca048f50389e9ad14cecea0d16b4a7193b1bf9e87c91cc54be30e46abcc57d4f2ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0112cff95349f8cfdcd33f56a54d3cef855cff4c816134f214a64779a9a5c5771885cea96c6955a8a21f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0xefe17a",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xda1aaef16d70f43be894ea2007d54e9b8292b6c7ccb72b8a72a034bb26e6a863",
+        "lastblockhash" : "0x0bc8934429f493cb2e4b9b612c9bd8da3718a4fac217b1488536fd6810d8c5a4",
         "network" : "Byzantium",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -126,10 +126,10 @@
     "Delegatecall1024OOG_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json",
-            "sourceHash" : "1ff4004f31ee130024bd3a1ee1234e9785d2115fa7448815ca6462616c5b557d"
+            "sourceHash" : "42dfc4da9c81bd2f0b8f44a710a7217ecba20c5c70230f3be093f99c50abd8f0"
         },
         "blocks" : [
             {
@@ -140,9 +140,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x3a8720",
-                    "hash" : "0x5c02198a37b1b23cef1777c7fe104021996b422bc319b727a90e3625a2c1aea3",
-                    "mixHash" : "0xc02b4a0c74a73043e8e4e013c53399a01eb81abcd6b9574715a15f4e0e7b575a",
-                    "nonce" : "0x3bd2bc50c0ff810e",
+                    "hash" : "0xca3a51bdd48e0e8be19a469ea39c64446dc4fc0aae891f81eba39a4e1cc4ff92",
+                    "mixHash" : "0x6cedcab20f38cf94cf393734d1bf2f3185420d92eb8867bae584468568d4912e",
+                    "nonce" : "0xe066e7b32142ce74",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
                     "receiptTrie" : "0xb951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
@@ -151,10 +151,10 @@
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a0c02b4a0c74a73043e8e4e013c53399a01eb81abcd6b9574715a15f4e0e7b575a883bd2bc50c0ff810ef862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a06cedcab20f38cf94cf393734d1bf2f3185420d92eb8867bae584468568d4912e88e066e7b32142ce74f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0xefe17a",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -188,7 +188,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5c02198a37b1b23cef1777c7fe104021996b422bc319b727a90e3625a2c1aea3",
+        "lastblockhash" : "0xca3a51bdd48e0e8be19a469ea39c64446dc4fc0aae891f81eba39a4e1cc4ff92",
         "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -247,258 +247,13 @@
             }
         }
     },
-    "Delegatecall1024OOG_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/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json",
-            "sourceHash" : "1ff4004f31ee130024bd3a1ee1234e9785d2115fa7448815ca6462616c5b557d"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x3a8720",
-                    "hash" : "0x34c8af0d712d40f24db992d07189dfda21717f968e7bbc99e302a52bcde012a8",
-                    "mixHash" : "0x12e18ef14a0ca11422e248e1428127ddce575e29d00246cb700e14c8c6515280",
-                    "nonce" : "0x5fb85bf77944edd1",
-                    "number" : "0x01",
-                    "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-                    "receiptTrie" : "0xb951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934e",
-                    "stateRoot" : "0x94df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba094df02941f75c4041cb9a77e0fd9f411d907bf8105ca508f7bf530bc254b5e54a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0b951b43e7f02950467ef33072a3996a8bc99e4f6c3324f36ece62b53c74b934eb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff833a87208203e880a012e18ef14a0ca11422e248e1428127ddce575e29d00246cb700e14c8c6515280885fb85bf77944edd1f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0xefe17a",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xdd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176",
-                        "s" : "0x7c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x34c8af0d712d40f24db992d07189dfda21717f968e7bbc99e302a52bcde012a8",
-        "network" : "EIP158",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffc578d5",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182452e8720",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x040a",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x85",
-                    "0x01" : "0x01",
-                    "0x02" : "0x020789"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "Delegatecall1024OOG_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/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json",
-            "sourceHash" : "1ff4004f31ee130024bd3a1ee1234e9785d2115fa7448815ca6462616c5b557d"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xefe17a",
-                    "hash" : "0x317fdd2ac5b06a32db0f1f13fdc38aa49ba9f78ba8dd82dd5b814c18e1cb51a9",
-                    "mixHash" : "0x95d2ddc4cc47ebcc52be7f1f4b329a073d43cd2cd202344161c92b46d0d05ee0",
-                    "nonce" : "0x084d7a2b6fa5add6",
-                    "number" : "0x01",
-                    "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-                    "receiptTrie" : "0x1ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4",
-                    "stateRoot" : "0xf594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0f594a9079b032fa86f02f935008d750c8de1a3a2a126f123a3a929a70d2e5e30a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca01ecc2eb3a840a8e5bb94939e42e5e783e0343256cb2ca6ddeef3ef3824f976a4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efe17a8203e880a095d2ddc4cc47ebcc52be7f1f4b329a073d43cd2cd202344161c92b46d0d05ee088084d7a2b6fa5add6f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0xefe17a",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xdd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176",
-                        "s" : "0x7c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x317fdd2ac5b06a32db0f1f13fdc38aa49ba9f78ba8dd82dd5b814c18e1cb51a9",
-        "network" : "Frontier",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffff101e85",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x4563918245e3e17a",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b610401600054046001036127105a0302f46001556103e860005402600101600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "Delegatecall1024OOG_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024OOG_d0g0v0Filler.json",
-            "sourceHash" : "1ff4004f31ee130024bd3a1ee1234e9785d2115fa7448815ca6462616c5b557d"
+            "sourceHash" : "42dfc4da9c81bd2f0b8f44a710a7217ecba20c5c70230f3be093f99c50abd8f0"
         },
         "blocks" : [
             {
@@ -509,9 +264,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xefd576",
-                    "hash" : "0x4be1c98cc60928d5e627ae719a09c66b177d62329e7cfcac806cd456f16d2d29",
-                    "mixHash" : "0xfaac7b5d512c14f0d4fa37c2bc1fe87d6337cef2900e17b65296af152f1a4717",
-                    "nonce" : "0x257ea05202aed455",
+                    "hash" : "0xde45c668816b4b31d264efc6efbb6e19830c4ab4f109f1ef8014c771ddd94802",
+                    "mixHash" : "0x18849a76064904f2bd57e82adbf287e0c26ac1537b7a3c2252181dcac45ef7f3",
+                    "nonce" : "0x2bfd8b3ca8a1e4d2",
                     "number" : "0x01",
                     "parentHash" : "0xe75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202f",
                     "receiptTrie" : "0xcdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277",
@@ -520,10 +275,10 @@
                     "transactionsTrie" : "0x05228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbc",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0cdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efd5768203e880a0faac7b5d512c14f0d4fa37c2bc1fe87d6337cef2900e17b65296af152f1a471788257ea05202aed455f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
+                "rlp" : "0xf90265f901fda0e75d47691b726c8c312a99cdc15c3685d5200fcefa3be699586a6370405e202fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba07ff231b903aabb1ca1dac4e67c5e769cbd9f9d1227848dcb0d075fad549633d5a005228c15750d1455c5afe47e9759d27e194f5fc66752d3faf84ffe17ce9bfcbca0cdec5bf73a796903dd19010beb18d6cb74cb58e715970e1cd5faf143db9a3277b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83efd5768203e880a018849a76064904f2bd57e82adbf287e0c26ac1537b7a3c2252181dcac45ef7f3882bfd8b3ca8a1e4d2f862f860800183efe17a94bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0dd18dcb7c4d6ae974fc0646511b8682a390dd3fe780fe7d5ac626f8eb841a176a07c0d8ae91b46d59fc98b5c154a3a59f35dca42f0127e96913bbad8d9ce02f752c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0xefe17a",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -557,7 +312,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0ab1cde6303da0d692e2d2fd852f572e1cf6f9c93bad37fd3732f8255f17a36f8a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4be1c98cc60928d5e627ae719a09c66b177d62329e7cfcac806cd456f16d2d29",
+        "lastblockhash" : "0xde45c668816b4b31d264efc6efbb6e19830c4ab4f109f1ef8014c771ddd94802",
         "network" : "Homestead",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0.json
index 7d860ce7b..d65ef9ea6 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0.json
@@ -2,10 +2,10 @@
     "Delegatecall1024_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json",
-            "sourceHash" : "c869fecb3ec3c86577291d7ab8cc2bf986ea632579faa4dcbe045142c86879b5"
+            "sourceHash" : "e7b0c0bd82c9620c99abfb3f4f381dcad90ccb5d8d2083aa167b957627832386"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xabc5ed",
-                    "hash" : "0xbbade59b4e77095dafeef6d01ee035d771c7a35cad7960898e8c61a47c5bf19a",
-                    "mixHash" : "0xa25cd42d3a8f096eae276f1a0bccfeedadd793b2dd29b3c50e5369168cb62420",
-                    "nonce" : "0x1b02b1f6bdb91822",
+                    "hash" : "0x1a349007208b3cf588ba3300d8b0898de0c26ed59cf9a25f28a3354020d847c6",
+                    "mixHash" : "0x7dacf1a2553b8c7eedbe2d8836a757a64ef8789d721cfdeda863e0f8574a2a36",
+                    "nonce" : "0x1f4185cbfa97b0c7",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
                     "receiptTrie" : "0x582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0c323f1e06b1aa65f236d366d9439d65a925d723d7c694ab034ffb9b8a83bccf8a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0a25cd42d3a8f096eae276f1a0bccfeedadd793b2dd29b3c50e5369168cb62420881b02b1f6bdb91822f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0c323f1e06b1aa65f236d366d9439d65a925d723d7c694ab034ffb9b8a83bccf8a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0582bc25838a0ff4f4056ee975c00c600ecc01be2c97649341ca1df6408d8ef08b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a07dacf1a2553b8c7eedbe2d8836a757a64ef8789d721cfdeda863e0f8574a2a36881f4185cbfa97b0c7f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbbade59b4e77095dafeef6d01ee035d771c7a35cad7960898e8c61a47c5bf19a",
+        "lastblockhash" : "0x1a349007208b3cf588ba3300d8b0898de0c26ed59cf9a25f28a3354020d847c6",
         "network" : "Byzantium",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -125,10 +125,10 @@
     "Delegatecall1024_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json",
-            "sourceHash" : "c869fecb3ec3c86577291d7ab8cc2bf986ea632579faa4dcbe045142c86879b5"
+            "sourceHash" : "e7b0c0bd82c9620c99abfb3f4f381dcad90ccb5d8d2083aa167b957627832386"
         },
         "blocks" : [
             {
@@ -139,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0xabc5ed",
-                    "hash" : "0x5fccf20e332d117ed207e626614e0c1eb3e02cf1741b4d3876b0bc882dc5cf6a",
-                    "mixHash" : "0x15a49ffad1a73af8d5fd73fdb95c94f30393043a09ca50cf236750aff47c1acd",
-                    "nonce" : "0x482c820f94472a86",
+                    "hash" : "0x6ce608e5518c098aafdc11c8365da827e94e87f955700f3fe15981990ed79761",
+                    "mixHash" : "0xfaa758ae22f9ae7a4c5beb70a538ccb0a5d1440e5515c81c6f6aa00c635ab42e",
+                    "nonce" : "0x6564e673c1303335",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
                     "receiptTrie" : "0x6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
@@ -150,10 +150,10 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a015a49ffad1a73af8d5fd73fdb95c94f30393043a09ca50cf236750aff47c1acd88482c820f94472a86f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a0faa758ae22f9ae7a4c5beb70a538ccb0a5d1440e5515c81c6f6aa00c635ab42e886564e673c1303335f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -187,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5fccf20e332d117ed207e626614e0c1eb3e02cf1741b4d3876b0bc882dc5cf6a",
+        "lastblockhash" : "0x6ce608e5518c098aafdc11c8365da827e94e87f955700f3fe15981990ed79761",
         "network" : "EIP150",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
@@ -245,257 +245,13 @@
             }
         }
     },
-    "Delegatecall1024_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/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json",
-            "sourceHash" : "c869fecb3ec3c86577291d7ab8cc2bf986ea632579faa4dcbe045142c86879b5"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0xabc5ed",
-                    "hash" : "0x2064dae796a929c2de072b3870ce13a71154d00038caa9b70a5e7c7657c3ac3f",
-                    "mixHash" : "0x4ff17d3260f752238076b1aadd6710c588cf90a185c558c9ae2c837c1b808151",
-                    "nonce" : "0x370b5461d804ffd0",
-                    "number" : "0x01",
-                    "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-                    "receiptTrie" : "0x6c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1d",
-                    "stateRoot" : "0xcd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceff",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026af901fda09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cd7cf24add2250c0f01134473d01baacbc79f91d939921d3eba3eb9cb865ceffa05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa06c72645abf959a7d2985444ad887d34899c6f65345479be7e30337a1b3530f1db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff83abc5ed8203e880a04ff17d3260f752238076b1aadd6710c588cf90a185c558c9ae2c837c1b80815188370b5461d804ffd0f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x7ffffffffffffff0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
-                        "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x9103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2064dae796a929c2de072b3870ce13a71154d00038caa9b70a5e7c7657c3ac3f",
-        "network" : "EIP158",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffff543a08",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x45639182459fc5ed",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x040a",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x0401",
-                    "0x01" : "0x01"
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "Delegatecall1024_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/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json",
-            "sourceHash" : "c869fecb3ec3c86577291d7ab8cc2bf986ea632579faa4dcbe045142c86879b5"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x7fffffffffffffff",
-                    "gasUsed" : "0x7ffffffffffffff0",
-                    "hash" : "0x96a4fb6ad8ac43198baa8d3c24f66e49db102ffeb5f9aa59a88fcfce209ef2dd",
-                    "mixHash" : "0x4bfe1adc671da725715582daae4af58eb0d7e128e7a214d8482aa77ac78203cb",
-                    "nonce" : "0x7a7fafcb5a42d177",
-                    "number" : "0x01",
-                    "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-                    "receiptTrie" : "0xdce0eee4437c2b1a3a7d6f4d8eff8641b7cf8a2362b2fb371f7326daf0a532a8",
-                    "stateRoot" : "0xcf0eabd33a4bbcacd8747bbe71762811ecdc8bd366d82e3f5fa8d888dde53c48",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9026ff90202a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba0cf0eabd33a4bbcacd8747bbe71762811ecdc8bd366d82e3f5fa8d888dde53c48a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa0dce0eee4437c2b1a3a7d6f4d8eff8641b7cf8a2362b2fb371f7326daf0a532a8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff887ffffffffffffff08203e880a04bfe1adc671da725715582daae4af58eb0d7e128e7a214d8482aa77ac78203cb887a7fafcb5a42d177f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x7ffffffffffffff0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74",
-                        "s" : "0x392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818",
-                        "to" : "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b",
-                        "v" : "0x1c",
-                        "value" : "0x0a"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x7fffffffffffffff",
-            "gasUsed" : "0x00",
-            "hash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x9103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86f",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x96a4fb6ad8ac43198baa8d3c24f66e49db102ffeb5f9aa59a88fcfce209ef2dd",
-        "network" : "Frontier",
-        "postState" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffff800000000000000f",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xb94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xc563918244f3fff0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0xffffffffffffffffffffffffffffffff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaaf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1b58",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xbbbf5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0400",
-                "code" : "0x600160005401600055600060006000600073bbbf5374fce5edbc8e2a8697c15331677e6ebf0b650ffffffffffff4600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "Delegatecall1024_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/Delegatecall1024_d0g0v0Filler.json",
-            "sourceHash" : "c869fecb3ec3c86577291d7ab8cc2bf986ea632579faa4dcbe045142c86879b5"
+            "sourceHash" : "e7b0c0bd82c9620c99abfb3f4f381dcad90ccb5d8d2083aa167b957627832386"
         },
         "blocks" : [
             {
@@ -506,9 +262,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x7fffffffffffffff",
                     "gasUsed" : "0x10000000b42a",
-                    "hash" : "0x3cd746be482aacd722310cb340e565bd5cafa70aaf73b238b518e95e2ac26556",
-                    "mixHash" : "0xb3ddf4f69f168d7ce7aa1c0a613f283b95a1436a24bfe9e7b837cf675208e634",
-                    "nonce" : "0x0da516650d422c78",
+                    "hash" : "0x5c5b51d41956e05b32a53a8143f6252f6c32f1601fc1a8266da41ec27757d37a",
+                    "mixHash" : "0x7b8043d2d45c17ab13385cfdc574d01f32fbef86101609c5293ca0ac8b922985",
+                    "nonce" : "0x1ff98b4700c01c1b",
                     "number" : "0x01",
                     "parentHash" : "0x9a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222f",
                     "receiptTrie" : "0x3c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55",
@@ -517,10 +273,10 @@
                     "transactionsTrie" : "0x5d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9026df90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba08dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa03c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000b42a8203e880a0b3ddf4f69f168d7ce7aa1c0a613f283b95a1436a24bfe9e7b837cf675208e634880da516650d422c78f867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
+                "rlp" : "0xf9026df90200a09a21366b3dbd349123109c68f0c254de33814073d6468a100fd19e2339e2222fa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba08dea1eb69b6cfe027335efaf54b7347d8f7cec4c455895ea49a391ed1d67a076a05d603792494b9643291b80b9dbc9d5fba242d8bfa214f915b041f1e91cf6c9caa03c2501c6b8a5a6b804f34593cecc4c6c70b7d5d9d376a0191e387a317e20fc55b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001887fffffffffffffff8610000000b42a8203e880a07b8043d2d45c17ab13385cfdc574d01f32fbef86101609c5293ca0ac8b922985881ff98b4700c01c1bf867f8658001887ffffffffffffff094bbbf5374fce5edbc8e2a8697c15331677e6ebf0b0a801ca0949173aa91b1c62177a9d37740fcf7ecd6ab08cd1a0e7323fd61f5c5dbfd6b74a0392dbbe386b82a50d6af8e9c634002809a6601227f35c44af9eedf434a9be818c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x7ffffffffffffff0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -554,7 +310,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fff901faa00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d4934794b94f5374fce5edbc8e2a8697c15331677e6ebf0ba09103a4c1d733612b10cc5fe84d39e065c28241f21329814cc7a1b34e8b94c86fa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080887fffffffffffffff808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3cd746be482aacd722310cb340e565bd5cafa70aaf73b238b518e95e2ac26556",
+        "lastblockhash" : "0x5c5b51d41956e05b32a53a8143f6252f6c32f1601fc1a8266da41ec27757d37a",
         "network" : "Homestead",
         "postState" : {
             "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g0v0.json
index ee2c0de27..7a8d65433 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g0v0.json
@@ -2,10 +2,10 @@
     "callOutput1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json",
-            "sourceHash" : "93c35a004c8b8ff3c01ba72beb556e74a5042ecdb4f4509fcbdac3038c591332"
+            "sourceHash" : "d1064bd96dc73f3b04418300961ea3160c151eda155c04d6ec1665c0e01bfd52"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x5c3fd6019f316a14baab627bdccecc594d8a92ce79bab8602b9b280b3bed2c29",
-                    "mixHash" : "0x43ffcd0ad7b9650cd4ddd1608d4a71a9aad1672ee8c2197407e4c3db64ffd47d",
-                    "nonce" : "0xe46f63e7c7ddb385",
+                    "hash" : "0x0b5eca6e9310fe7bff83476e00e2a021963225bbf7c471b8a866cd551a7ba227",
+                    "mixHash" : "0xb4494bea6d7a338402a089d9ae9e863ad05990e0aa515745983d8f75d0af28b2",
+                    "nonce" : "0x7dc05a8effd1474c",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00212d941445e50a5d7ddd13d42662a4e3314952a7805c20f68d9b2cf8b583b3aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a043ffcd0ad7b9650cd4ddd1608d4a71a9aad1672ee8c2197407e4c3db64ffd47d88e46f63e7c7ddb385c0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00212d941445e50a5d7ddd13d42662a4e3314952a7805c20f68d9b2cf8b583b3aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0b4494bea6d7a338402a089d9ae9e863ad05990e0aa515745983d8f75d0af28b2887dc05a8effd1474cc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -53,7 +53,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5c3fd6019f316a14baab627bdccecc594d8a92ce79bab8602b9b280b3bed2c29",
+        "lastblockhash" : "0x0b5eca6e9310fe7bff83476e00e2a021963225bbf7c471b8a866cd551a7ba227",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -109,343 +109,13 @@
             }
         }
     },
-    "callOutput1_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/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json",
-            "sourceHash" : "93c35a004c8b8ff3c01ba72beb556e74a5042ecdb4f4509fcbdac3038c591332"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x34bd5137abd34d7cc50f62d44fde70efde61f7dd3f86ed29bd9e3a27c1927792",
-                    "mixHash" : "0x314e2ad11a132b57bbf5da6b49e23977a4e1e81ad0e42fd33919fa60a4473e66",
-                    "nonce" : "0x2ae90e8189359619",
-                    "number" : "0x01",
-                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xdbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0314e2ad11a132b57bbf5da6b49e23977a4e1e81ad0e42fd33919fa60a4473e66882ae90e8189359619c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x34bd5137abd34d7cc50f62d44fde70efde61f7dd3f86ed29bd9e3a27c1927792",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput1_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/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json",
-            "sourceHash" : "93c35a004c8b8ff3c01ba72beb556e74a5042ecdb4f4509fcbdac3038c591332"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0xdd00fe4bb0656e1b0e4ab8d35d6d1c92c11e67ed94ee1897b3f73e82f2d4f544",
-                    "mixHash" : "0x36064ef0b8904a7df389d1e10376a53b315f0e96175c74bdbe03c0adb84d9d0d",
-                    "nonce" : "0x4cf4256316d08944",
-                    "number" : "0x01",
-                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xdbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a036064ef0b8904a7df389d1e10376a53b315f0e96175c74bdbe03c0adb84d9d0d884cf4256316d08944c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdd00fe4bb0656e1b0e4ab8d35d6d1c92c11e67ed94ee1897b3f73e82f2d4f544",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput1_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/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json",
-            "sourceHash" : "93c35a004c8b8ff3c01ba72beb556e74a5042ecdb4f4509fcbdac3038c591332"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x2c9b4e9088ce31699ee8120312c22149a39941cbea912168548292d9f320df03",
-                    "mixHash" : "0x47f8478e08182543ee96360c01994432003a2c318ec10dffd88d862e7d410376",
-                    "nonce" : "0x3cc1cdc7842de99a",
-                    "number" : "0x01",
-                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xdbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a047f8478e08182543ee96360c01994432003a2c318ec10dffd88d862e7d410376883cc1cdc7842de99ac0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2c9b4e9088ce31699ee8120312c22149a39941cbea912168548292d9f320df03",
-        "network" : "Frontier",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callOutput1_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g0v0Filler.json",
-            "sourceHash" : "93c35a004c8b8ff3c01ba72beb556e74a5042ecdb4f4509fcbdac3038c591332"
+            "sourceHash" : "d1064bd96dc73f3b04418300961ea3160c151eda155c04d6ec1665c0e01bfd52"
         },
         "blocks" : [
             {
@@ -456,9 +126,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xe76ba97bebba5519c5785779d9d05689cf53f9df1178c81a1d105420d1924f69",
-                    "mixHash" : "0x358a800a2364dac8d203ba06ae9f6f7ea22a4ee6e9bfae2c4911a751cc2d7e19",
-                    "nonce" : "0xee350d382d596c0f",
+                    "hash" : "0xa14a40ba28c4fdabced9ca6c6916ccabdfdb570e2c8f526e9cfcf833c57ae74f",
+                    "mixHash" : "0x9a67526cd19aad7f90015d41da2a0aca8dc9d9875fbc63af5f7f871fa9c991d8",
+                    "nonce" : "0xc8f55417c930095a",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -467,7 +137,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0358a800a2364dac8d203ba06ae9f6f7ea22a4ee6e9bfae2c4911a751cc2d7e1988ee350d382d596c0fc0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a09a67526cd19aad7f90015d41da2a0aca8dc9d9875fbc63af5f7f871fa9c991d888c8f55417c930095ac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -493,7 +163,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe76ba97bebba5519c5785779d9d05689cf53f9df1178c81a1d105420d1924f69",
+        "lastblockhash" : "0xa14a40ba28c4fdabced9ca6c6916ccabdfdb570e2c8f526e9cfcf833c57ae74f",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g1v0.json
index 5d7c79229..8e11bca5e 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g1v0.json
@@ -2,10 +2,10 @@
     "callOutput1_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json",
-            "sourceHash" : "00b225e267cd3ad0955cb4107362e732da3ba552d3d068431f8e35c9c2a573fc"
+            "sourceHash" : "dff9978ea58391f90ac0896358e9fda43216954d9a48e3de743b63110fe2895e"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0xdfbd371668e8497a507eee14565db441fb6471b543b220166c5f02cd10333ca5",
-                    "mixHash" : "0xbbe3964ea266232c969b7887fc155b767bb3f57d7914878b04ff066ee83e96b0",
-                    "nonce" : "0x240908271e12d559",
+                    "hash" : "0x36c479fc3af8ba3d117beebfe37a0cced9e1167a50a3a711c75d384d4787a023",
+                    "mixHash" : "0x0ce8ee244984ab53709bfbe3885e7f66c8e7fd7813bc6ce5fc152e9aeafd9c8a",
+                    "nonce" : "0x8d8bfa62b2f9f8aa",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0970f9fc821d189de12f6c5b2bdd267b8b9bf2544a70444ea9a790165aa1550c6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0bbe3964ea266232c969b7887fc155b767bb3f57d7914878b04ff066ee83e96b088240908271e12d559f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0970f9fc821d189de12f6c5b2bdd267b8b9bf2544a70444ea9a790165aa1550c6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a00ce8ee244984ab53709bfbe3885e7f66c8e7fd7813bc6ce5fc152e9aeafd9c8a888d8bfa62b2f9f8aaf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0dbba0",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdfbd371668e8497a507eee14565db441fb6471b543b220166c5f02cd10333ca5",
+        "lastblockhash" : "0x36c479fc3af8ba3d117beebfe37a0cced9e1167a50a3a711c75d384d4787a023",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -121,378 +121,13 @@
             }
         }
     },
-    "callOutput1_d0g1v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json",
-            "sourceHash" : "00b225e267cd3ad0955cb4107362e732da3ba552d3d068431f8e35c9c2a573fc"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a1",
-                    "hash" : "0x57b4b995d1476da48c7db464bff97c93f52376ca38c96964c06fc4f67e2f64c0",
-                    "mixHash" : "0xc61fee970abecf372949b992692937d853a9b529a73d435249ac6532c7757525",
-                    "nonce" : "0xdf566b34d256cb74",
-                    "number" : "0x01",
-                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "0xd1bb9d84141c1be781b4e04e3dd44d935f1aca8ba91a06bbdcbd359eb614220d",
-                    "stateRoot" : "0x2de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0d1bb9d84141c1be781b4e04e3dd44d935f1aca8ba91a06bbdcbd359eb614220db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0c61fee970abecf372949b992692937d853a9b529a73d435249ac6532c775752588df566b34d256cb74f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x57b4b995d1476da48c7db464bff97c93f52376ca38c96964c06fc4f67e2f64c0",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput1_d0g1v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json",
-            "sourceHash" : "00b225e267cd3ad0955cb4107362e732da3ba552d3d068431f8e35c9c2a573fc"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a1",
-                    "hash" : "0x562af8bd4cea39e9f4d0a2df586f9304095dbb109d2556ff229bfa8479f48f76",
-                    "mixHash" : "0xacd04cf3bace3f9f4130291c90b7268e7d5f7ebc07b610f71659ba2f7c38b486",
-                    "nonce" : "0xcdaafa8ffbf44385",
-                    "number" : "0x01",
-                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "0xb42267fd5c3b64c4c62491b69b4c40d5fe0bddc2d44d37b06a5264e715fa18f1",
-                    "stateRoot" : "0x2de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0b42267fd5c3b64c4c62491b69b4c40d5fe0bddc2d44d37b06a5264e715fa18f1b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0acd04cf3bace3f9f4130291c90b7268e7d5f7ebc07b610f71659ba2f7c38b48688cdaafa8ffbf44385f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x562af8bd4cea39e9f4d0a2df586f9304095dbb109d2556ff229bfa8479f48f76",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput1_d0g1v0_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json",
-            "sourceHash" : "00b225e267cd3ad0955cb4107362e732da3ba552d3d068431f8e35c9c2a573fc"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0dbba0",
-                    "hash" : "0x34bcbecf03c0af948042442948411626124efe4ecbfdf67c71bd3b4c1c5901af",
-                    "mixHash" : "0x220b8a7193d02ef0427838c8f60d4169b05db060dcfb1e71335742ed6ebd1494",
-                    "nonce" : "0xc43cea834a128611",
-                    "number" : "0x01",
-                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "0x17ca6f3e613f1f01fcc3ef74b0b5c4b36e03972064b4ec9b5cecec9113610dde",
-                    "stateRoot" : "0x224b58c0cf623a6075540f4888444da0f00052f9706b4a68e53167ea937af4e2",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0224b58c0cf623a6075540f4888444da0f00052f9706b4a68e53167ea937af4e2a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a017ca6f3e613f1f01fcc3ef74b0b5c4b36e03972064b4ec9b5cecec9113610ddeb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0220b8a7193d02ef0427838c8f60d4169b05db060dcfb1e71335742ed6ebd149488c43cea834a128611f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x34bcbecf03c0af948042442948411626124efe4ecbfdf67c71bd3b4c1c5901af",
-        "network" : "Frontier",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callOutput1_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput1_d0g1v0Filler.json",
-            "sourceHash" : "00b225e267cd3ad0955cb4107362e732da3ba552d3d068431f8e35c9c2a573fc"
+            "sourceHash" : "dff9978ea58391f90ac0896358e9fda43216954d9a48e3de743b63110fe2895e"
         },
         "blocks" : [
             {
@@ -503,9 +138,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb40d",
-                    "hash" : "0xd9f07947ec9f966a1e2245670af8557cf36ee02d7e811b9e8c725e5b43d64f99",
-                    "mixHash" : "0xbdb5a6c16bbc50303271b530507ae65a08ab8e8313e56c572ea7c9139795ec88",
-                    "nonce" : "0xa3a97d37da06bffa",
+                    "hash" : "0x5f5e7c5de5d1914683d655f0afb1904d598d0b94d44eff22895b4130fb462dac",
+                    "mixHash" : "0xd4fbddb4725cd4e1045c08a6fb24c146aac6f05620ae147071f33cdac4305c6b",
+                    "nonce" : "0xcdc64f3eabd5b67b",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x275ceb4f5888c4aeb32d782c7a5b279dfaca0f399200b910d7fc11b2cf27b4e3",
@@ -514,10 +149,10 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0275ceb4f5888c4aeb32d782c7a5b279dfaca0f399200b910d7fc11b2cf27b4e3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a0bdb5a6c16bbc50303271b530507ae65a08ab8e8313e56c572ea7c9139795ec8888a3a97d37da06bffaf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02de0485893eaadce2745797de9c1a8dba1c62f8e5c5adcc4c18b9cba2ec43319a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0275ceb4f5888c4aeb32d782c7a5b279dfaca0f399200b910d7fc11b2cf27b4e3b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a0d4fbddb4725cd4e1045c08a6fb24c146aac6f05620ae147071f33cdac4305c6b88cdc64f3eabd5b67bf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0dbba0",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -551,7 +186,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd9f07947ec9f966a1e2245670af8557cf36ee02d7e811b9e8c725e5b43d64f99",
+        "lastblockhash" : "0x5f5e7c5de5d1914683d655f0afb1904d598d0b94d44eff22895b4130fb462dac",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g0v0.json
index 7533da2d0..f84befc85 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g0v0.json
@@ -2,10 +2,10 @@
     "callOutput2_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json",
-            "sourceHash" : "4ddd59ec5b4e249d557714968e713aa9efc7e1c78af9d83f95ed3fd94cd7b33c"
+            "sourceHash" : "73b95f941fa49e6de9ad638064f41ab445299edbd87ddbe37c1ca2849c7414ca"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xf37bb083e75c0f9f10ecdb1a9d4b2a8bbf0c10ec0e7f599b2fdd5b38910fd647",
-                    "mixHash" : "0x38ec772d66ae44c8843d1a88ef1411b270fa399ff8cef272b39b14ce3ac833e6",
-                    "nonce" : "0x1f211a286ccf6b03",
+                    "hash" : "0xb4cebbed4372ed342adad29bb9308787fccf280f6d53697d54a8139c7e1d911a",
+                    "mixHash" : "0x7b3ec4651cc533f4929d767b7778a46a2c4cbe7333a6c7f0ae83209bcd2ea750",
+                    "nonce" : "0x19598dc98d3729d7",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045318ecda8b462e518f8b882df13be24a4e39ce872ca313cd7e3ee67c522c306a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a038ec772d66ae44c8843d1a88ef1411b270fa399ff8cef272b39b14ce3ac833e6881f211a286ccf6b03c0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045318ecda8b462e518f8b882df13be24a4e39ce872ca313cd7e3ee67c522c306a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a07b3ec4651cc533f4929d767b7778a46a2c4cbe7333a6c7f0ae83209bcd2ea7508819598dc98d3729d7c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -53,7 +53,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf37bb083e75c0f9f10ecdb1a9d4b2a8bbf0c10ec0e7f599b2fdd5b38910fd647",
+        "lastblockhash" : "0xb4cebbed4372ed342adad29bb9308787fccf280f6d53697d54a8139c7e1d911a",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -109,343 +109,13 @@
             }
         }
     },
-    "callOutput2_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/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json",
-            "sourceHash" : "4ddd59ec5b4e249d557714968e713aa9efc7e1c78af9d83f95ed3fd94cd7b33c"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x4f332b77b06424dc18752572055d0643cc55c7e9e951a57e2fd48a0fe99c5cdb",
-                    "mixHash" : "0xb6c87772445e3d18e83e7c037f172bb1dd8b50fa24d8878a2cdd87c96c140275",
-                    "nonce" : "0x9d259061b7a73806",
-                    "number" : "0x01",
-                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xa28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0b6c87772445e3d18e83e7c037f172bb1dd8b50fa24d8878a2cdd87c96c140275889d259061b7a73806c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4f332b77b06424dc18752572055d0643cc55c7e9e951a57e2fd48a0fe99c5cdb",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput2_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/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json",
-            "sourceHash" : "4ddd59ec5b4e249d557714968e713aa9efc7e1c78af9d83f95ed3fd94cd7b33c"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x62f00de26b87579a6829d0702a7bc8637054b0f3c77e8f77e191647a4b9271c4",
-                    "mixHash" : "0xa0216d0834065460c4732466b598736a3abf8b8cc2a05bb11a76dfc7c05f1b17",
-                    "nonce" : "0xc16ca6041da7a8f6",
-                    "number" : "0x01",
-                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xa28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0a0216d0834065460c4732466b598736a3abf8b8cc2a05bb11a76dfc7c05f1b1788c16ca6041da7a8f6c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x62f00de26b87579a6829d0702a7bc8637054b0f3c77e8f77e191647a4b9271c4",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput2_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/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json",
-            "sourceHash" : "4ddd59ec5b4e249d557714968e713aa9efc7e1c78af9d83f95ed3fd94cd7b33c"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x9bb171d61ecfecfc46d0195d0a0c86ac21a812abf230687d7280b9ed73729998",
-                    "mixHash" : "0xb5165a05ed064157b425d3a4b7a9a30cafeb73bdd493c60090eb6951254949e9",
-                    "nonce" : "0xd461ddc9d040d7ed",
-                    "number" : "0x01",
-                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xa28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0b5165a05ed064157b425d3a4b7a9a30cafeb73bdd493c60090eb6951254949e988d461ddc9d040d7edc0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9bb171d61ecfecfc46d0195d0a0c86ac21a812abf230687d7280b9ed73729998",
-        "network" : "Frontier",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callOutput2_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g0v0Filler.json",
-            "sourceHash" : "4ddd59ec5b4e249d557714968e713aa9efc7e1c78af9d83f95ed3fd94cd7b33c"
+            "sourceHash" : "73b95f941fa49e6de9ad638064f41ab445299edbd87ddbe37c1ca2849c7414ca"
         },
         "blocks" : [
             {
@@ -456,9 +126,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x99721caa6b60a994492ed4a2bdf552e9111ae848eda0875a06a5b31e79aa7b29",
-                    "mixHash" : "0x191dcc1069c100d9755f5bac3201224c8c32fc818eca0bfb44b8614ec7d5a092",
-                    "nonce" : "0x8fe1f366c1427842",
+                    "hash" : "0x636811d120ccd586cb0d5f9d1c667516aa52c975646be59138ca9cb68c500361",
+                    "mixHash" : "0x6c8bf31a1a0694644295889c3da307ef43c26c6af259d8f720b19e2365459406",
+                    "nonce" : "0x58b55ccfae83b685",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -467,7 +137,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0191dcc1069c100d9755f5bac3201224c8c32fc818eca0bfb44b8614ec7d5a092888fe1f366c1427842c0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a06c8bf31a1a0694644295889c3da307ef43c26c6af259d8f720b19e23654594068858b55ccfae83b685c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -493,7 +163,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x99721caa6b60a994492ed4a2bdf552e9111ae848eda0875a06a5b31e79aa7b29",
+        "lastblockhash" : "0x636811d120ccd586cb0d5f9d1c667516aa52c975646be59138ca9cb68c500361",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g1v0.json
index 6425fba44..317bd53f5 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g1v0.json
@@ -2,10 +2,10 @@
     "callOutput2_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json",
-            "sourceHash" : "3b5560a76bc5a3a02b248e3bb4d135450a0c81c988af825a236b9937a111718d"
+            "sourceHash" : "99dd0c4a42554e1c62750d9b2dd2ac280a538a11b43add1d1e5a2ec57f56d5f0"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0x909639be442e217fe9066d01ffc4af23e863185bc5c4916721a0b984e75a6879",
-                    "mixHash" : "0x54818dcecd7ecd3dc47ad07cae2f4d8bb7ea8adb301c0c0930eac31b02ffec55",
-                    "nonce" : "0x3d83d0e5fae8bb6b",
+                    "hash" : "0x38747642345c68289e7071bec9334e4ff9e47fc2f8a10f275808b37b96ba3f4d",
+                    "mixHash" : "0xbe26bff1a4cc74811317d072169d25c55643f3999443e5b542fce499cf3c28f7",
+                    "nonce" : "0xfacac67c8658de07",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090ae6a5df04711f034c55a3346433e415dc824f23c2e982dff5960fff5cd8d8da0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a054818dcecd7ecd3dc47ad07cae2f4d8bb7ea8adb301c0c0930eac31b02ffec55883d83d0e5fae8bb6bf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa090ae6a5df04711f034c55a3346433e415dc824f23c2e982dff5960fff5cd8d8da0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0be26bff1a4cc74811317d072169d25c55643f3999443e5b542fce499cf3c28f788facac67c8658de07f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0dbba0",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x909639be442e217fe9066d01ffc4af23e863185bc5c4916721a0b984e75a6879",
+        "lastblockhash" : "0x38747642345c68289e7071bec9334e4ff9e47fc2f8a10f275808b37b96ba3f4d",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -121,378 +121,13 @@
             }
         }
     },
-    "callOutput2_d0g1v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json",
-            "sourceHash" : "3b5560a76bc5a3a02b248e3bb4d135450a0c81c988af825a236b9937a111718d"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a1",
-                    "hash" : "0xf3ab5146dcf6c2b615a17abd810d42533b3e642c67dc6095f03d5cb344b26f85",
-                    "mixHash" : "0xa215626b0d743ef2a8b7d97ec6f35306c2b3797bffdd45027106ad26b11481a2",
-                    "nonce" : "0xdaf6f4aa7724de0b",
-                    "number" : "0x01",
-                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "0x8155ecb0f47c141840104bfa320b8d16f165d51304ec0579b03c4327944a7619",
-                    "stateRoot" : "0xda6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a08155ecb0f47c141840104bfa320b8d16f165d51304ec0579b03c4327944a7619b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0a215626b0d743ef2a8b7d97ec6f35306c2b3797bffdd45027106ad26b11481a288daf6f4aa7724de0bf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf3ab5146dcf6c2b615a17abd810d42533b3e642c67dc6095f03d5cb344b26f85",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput2_d0g1v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json",
-            "sourceHash" : "3b5560a76bc5a3a02b248e3bb4d135450a0c81c988af825a236b9937a111718d"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a1",
-                    "hash" : "0x9ccbca616fdad49475cf80707d63e315a52a5f48e7de915bbd2b3899845bacfc",
-                    "mixHash" : "0xa147abbd7a84dfd07a9af17ae2a38f0574c6576b7c59a267c0127cf274e6860a",
-                    "nonce" : "0x3441074ba2d61f6e",
-                    "number" : "0x01",
-                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "0x8c666c5bd9482943f98327db877d725af3c9ab80e78f5d657a41854884c0918c",
-                    "stateRoot" : "0xda6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a08c666c5bd9482943f98327db877d725af3c9ab80e78f5d657a41854884c0918cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0a147abbd7a84dfd07a9af17ae2a38f0574c6576b7c59a267c0127cf274e6860a883441074ba2d61f6ef865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9ccbca616fdad49475cf80707d63e315a52a5f48e7de915bbd2b3899845bacfc",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput2_d0g1v0_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json",
-            "sourceHash" : "3b5560a76bc5a3a02b248e3bb4d135450a0c81c988af825a236b9937a111718d"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0dbba0",
-                    "hash" : "0xb157f07586cafc4aba5343ac02d4eb4b837df7b7ae8b1fc8527462f62bfc28eb",
-                    "mixHash" : "0xb6ef694aaf3e2061082e1c2962654b5fb804a8daba6cf9c0071c1d8a7f2a175d",
-                    "nonce" : "0xcb18c426d5c9a7f7",
-                    "number" : "0x01",
-                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "0x38c891b253b753fa18c23d8e7949ec0ebc6e8e71d073cdff801f06ee6fc0d36a",
-                    "stateRoot" : "0x883346ec67cf5393b9c590023e26b403ce909c3e869a59bd50fcc4b648d18cee",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0883346ec67cf5393b9c590023e26b403ce909c3e869a59bd50fcc4b648d18ceea0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a038c891b253b753fa18c23d8e7949ec0ebc6e8e71d073cdff801f06ee6fc0d36ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0b6ef694aaf3e2061082e1c2962654b5fb804a8daba6cf9c0071c1d8a7f2a175d88cb18c426d5c9a7f7f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb157f07586cafc4aba5343ac02d4eb4b837df7b7ae8b1fc8527462f62bfc28eb",
-        "network" : "Frontier",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callOutput2_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput2_d0g1v0Filler.json",
-            "sourceHash" : "3b5560a76bc5a3a02b248e3bb4d135450a0c81c988af825a236b9937a111718d"
+            "sourceHash" : "99dd0c4a42554e1c62750d9b2dd2ac280a538a11b43add1d1e5a2ec57f56d5f0"
         },
         "blocks" : [
             {
@@ -503,9 +138,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb40d",
-                    "hash" : "0x21e6681459b95f14a0d5f43b37501be36f8e5564c63268d26972be1d97201ca0",
-                    "mixHash" : "0x8f65b76ce9a3eab10a133aca154df7b9d0523f5f64ba5e3d252a91f57f629569",
-                    "nonce" : "0x6759342798cbd0ba",
+                    "hash" : "0xa95895c9b5df075d8a99c63832ad68dbf5b8335efe23479e8786b344b896fe3f",
+                    "mixHash" : "0x89be67f9536adedb1e6b0f488ce23ea96410f4d5043b713d31c68089390fa836",
+                    "nonce" : "0x15742f209479dedb",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x773ca377cb35569da40f70601aeae4a7834a8601df8d65d95cd38f6906032146",
@@ -514,10 +149,10 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0773ca377cb35569da40f70601aeae4a7834a8601df8d65d95cd38f6906032146b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a08f65b76ce9a3eab10a133aca154df7b9d0523f5f64ba5e3d252a91f57f629569886759342798cbd0baf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0da6d0c1d67055fae870104ceedfa1cd3e5e224c4c16f153742e5934a3e4ee4b5a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0773ca377cb35569da40f70601aeae4a7834a8601df8d65d95cd38f6906032146b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a089be67f9536adedb1e6b0f488ce23ea96410f4d5043b713d31c68089390fa8368815742f209479dedbf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0dbba0",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -551,7 +186,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x21e6681459b95f14a0d5f43b37501be36f8e5564c63268d26972be1d97201ca0",
+        "lastblockhash" : "0xa95895c9b5df075d8a99c63832ad68dbf5b8335efe23479e8786b344b896fe3f",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0.json
index b8e23c73f..19bcb8e31 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0.json
@@ -2,10 +2,10 @@
     "callOutput3Fail_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json",
-            "sourceHash" : "377913474d102a3e7571a887d3db8ff51eee80a6def1da5705b2fd2f2e61325c"
+            "sourceHash" : "bf7df253eaaa3548a3386f39cbfdec0bf686f49bd7006d28c66775f091ab0c9e"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x1a623504727c07df510a1031bea8bc47bac012302da7afeaf6f7900b88587c35",
-                    "mixHash" : "0xdab1b13db9f09bb1eda2c687f1f2fbcb9b3ff9ad1c064a18557f09f10289af8f",
-                    "nonce" : "0x8c29dd43b737e05e",
+                    "hash" : "0x78e7e1124b1d6f48cd49c864a246f273276f4f37dcb4aa2ded2781bb5bf4cd28",
+                    "mixHash" : "0x2ad070c861fe5742a590c7c6a78e37622349dddd8259e0157252804013416dc0",
+                    "nonce" : "0x69341b37d465188a",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b92e6fb623cef4bb8a63bcc45546da5f8fa6d10bf8839586b83645e43fbec58ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0dab1b13db9f09bb1eda2c687f1f2fbcb9b3ff9ad1c064a18557f09f10289af8f888c29dd43b737e05ec0c0",
+                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b92e6fb623cef4bb8a63bcc45546da5f8fa6d10bf8839586b83645e43fbec58ea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02ad070c861fe5742a590c7c6a78e37622349dddd8259e0157252804013416dc08869341b37d465188ac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -53,7 +53,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1a623504727c07df510a1031bea8bc47bac012302da7afeaf6f7900b88587c35",
+        "lastblockhash" : "0x78e7e1124b1d6f48cd49c864a246f273276f4f37dcb4aa2ded2781bb5bf4cd28",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -109,343 +109,13 @@
             }
         }
     },
-    "callOutput3Fail_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/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json",
-            "sourceHash" : "377913474d102a3e7571a887d3db8ff51eee80a6def1da5705b2fd2f2e61325c"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x59a7cf5e9c4c5792d00f8fe05e1724f31b0094ff6dc9977f502dbdd5d47b3aa2",
-                    "mixHash" : "0x15ea1ab5712a72c472e09c6500c055b971b5ab1e9b827740e8cddea2650320eb",
-                    "nonce" : "0xf3498ecb2b23c24e",
-                    "number" : "0x01",
-                    "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x04dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a015ea1ab5712a72c472e09c6500c055b971b5ab1e9b827740e8cddea2650320eb88f3498ecb2b23c24ec0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x59a7cf5e9c4c5792d00f8fe05e1724f31b0094ff6dc9977f502dbdd5d47b3aa2",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3Fail_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/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json",
-            "sourceHash" : "377913474d102a3e7571a887d3db8ff51eee80a6def1da5705b2fd2f2e61325c"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0xafb5ae3a3f611899f067c25d07fa5e9f50e6c88cf82c322ec2497f96506df4e8",
-                    "mixHash" : "0x835890226b9b9434a7b7420d1c4e9f140af6e16306c47869cd70a15cd20447df",
-                    "nonce" : "0xb28ddbeeed13ce03",
-                    "number" : "0x01",
-                    "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x04dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0835890226b9b9434a7b7420d1c4e9f140af6e16306c47869cd70a15cd20447df88b28ddbeeed13ce03c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xafb5ae3a3f611899f067c25d07fa5e9f50e6c88cf82c322ec2497f96506df4e8",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3Fail_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/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json",
-            "sourceHash" : "377913474d102a3e7571a887d3db8ff51eee80a6def1da5705b2fd2f2e61325c"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x16d02de966c0557d98fe8c0c500b8afed5666fb903e7cda203d5c3a0ed6e46bb",
-                    "mixHash" : "0x9227f12134c353748914c1f0e1b801afb47187ce49f7168f15b0c718e61776a2",
-                    "nonce" : "0x0f7e0fcc1b2161e5",
-                    "number" : "0x01",
-                    "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x04dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a09227f12134c353748914c1f0e1b801afb47187ce49f7168f15b0c718e61776a2880f7e0fcc1b2161e5c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x16d02de966c0557d98fe8c0c500b8afed5666fb903e7cda203d5c3a0ed6e46bb",
-        "network" : "Frontier",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callOutput3Fail_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g0v0Filler.json",
-            "sourceHash" : "377913474d102a3e7571a887d3db8ff51eee80a6def1da5705b2fd2f2e61325c"
+            "sourceHash" : "bf7df253eaaa3548a3386f39cbfdec0bf686f49bd7006d28c66775f091ab0c9e"
         },
         "blocks" : [
             {
@@ -456,9 +126,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xba99476f436ffa539ebf9da213d75a67fac8edf72ee7abbf4bf8b2f7e2d764a9",
-                    "mixHash" : "0xe13b4bb708851350df49ce7044e858d010ec4eb3ba1878165ee12b2f445bda2e",
-                    "nonce" : "0x402cc1041f90fc48",
+                    "hash" : "0x44be9bc1b5cd4c6b172339cd4a6e9e8f72617c5f11d38cbb1862207f89f721e9",
+                    "mixHash" : "0xacca271044e0da104fc12dd94d60ca8cbf0106752bc24fb0021ccfe8c683bcea",
+                    "nonce" : "0xe6963bb9afe5c039",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -467,7 +137,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0e13b4bb708851350df49ce7044e858d010ec4eb3ba1878165ee12b2f445bda2e88402cc1041f90fc48c0c0",
+                "rlp" : "0xf901faf901f5a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa004dcef4c25fe3af85a98f78588c0406654c6d9e52a1fd2bb8fc7985a43505c07a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0acca271044e0da104fc12dd94d60ca8cbf0106752bc24fb0021ccfe8c683bcea88e6963bb9afe5c039c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -493,7 +163,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xba99476f436ffa539ebf9da213d75a67fac8edf72ee7abbf4bf8b2f7e2d764a9",
+        "lastblockhash" : "0x44be9bc1b5cd4c6b172339cd4a6e9e8f72617c5f11d38cbb1862207f89f721e9",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0.json
index cf14d8800..a1e7bfc9d 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0.json
@@ -2,10 +2,10 @@
     "callOutput3Fail_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json",
-            "sourceHash" : "1da9cab21b29d4b74b49f30565ea62c34e1fa3185d076f9550b6490e85c46f1f"
+            "sourceHash" : "8c09b75d26f76e03c75cb41ed46f934ed7bc50adfc38e34e0f2ad660b37a76f2"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01665d",
-                    "hash" : "0x7b2ad6dd281ba2cc7181f3cc0aa2143950f29c74b4460c746a129a4fdbcf5214",
-                    "mixHash" : "0xf67821d2cc7e55fad96684f89a6ddcf173280af6118c8a51cc91dd92f310267e",
-                    "nonce" : "0xf9cbdc95f09748c8",
+                    "hash" : "0x4aae28bb17c3c3199468cc91dd2223b133cafbc3b327a62c3946e6aeb786fbd5",
+                    "mixHash" : "0xc785e587dc2d858244b38292fb9db134fb49e95a6d6cd3e73a1179055bbc36af",
+                    "nonce" : "0x220f53d2d730fce8",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088e0ba48b0d1753d5c8be6bbebdafa72412ef376475700249d854e22520d369aa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0f67821d2cc7e55fad96684f89a6ddcf173280af6118c8a51cc91dd92f310267e88f9cbdc95f09748c8f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa088e0ba48b0d1753d5c8be6bbebdafa72412ef376475700249d854e22520d369aa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0c785e587dc2d858244b38292fb9db134fb49e95a6d6cd3e73a1179055bbc36af88220f53d2d730fce8f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0dbba0",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7b2ad6dd281ba2cc7181f3cc0aa2143950f29c74b4460c746a129a4fdbcf5214",
+        "lastblockhash" : "0x4aae28bb17c3c3199468cc91dd2223b133cafbc3b327a62c3946e6aeb786fbd5",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -121,378 +121,13 @@
             }
         }
     },
-    "callOutput3Fail_d0g1v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json",
-            "sourceHash" : "1da9cab21b29d4b74b49f30565ea62c34e1fa3185d076f9550b6490e85c46f1f"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x01665d",
-                    "hash" : "0xb8fd687fb763dd98154654d1e7ed95e6e1eb6b39836eb46e3740f2ffce45162b",
-                    "mixHash" : "0x5f269128ed92855e42718e96e53ff40f124a6f56bb646c66f7bc616190c9cf8f",
-                    "nonce" : "0x1e395ced02c1b75b",
-                    "number" : "0x01",
-                    "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-                    "receiptTrie" : "0x7e1bc6464f9e88866ae10a6923d64f497f7e7a96d30e22393e7085fd36298278",
-                    "stateRoot" : "0xdbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a07e1bc6464f9e88866ae10a6923d64f497f7e7a96d30e22393e7085fd36298278b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a05f269128ed92855e42718e96e53ff40f124a6f56bb646c66f7bc616190c9cf8f881e395ced02c1b75bf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb8fd687fb763dd98154654d1e7ed95e6e1eb6b39836eb46e3740f2ffce45162b",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3Fail_d0g1v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json",
-            "sourceHash" : "1da9cab21b29d4b74b49f30565ea62c34e1fa3185d076f9550b6490e85c46f1f"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x01665d",
-                    "hash" : "0x62e9e23cf9752cf4c980dfb2abedae18f44d50a17e7e2fda8930c9c6de0895dc",
-                    "mixHash" : "0x53f95098fb043e5f5f2a490d699de2f4952b9038091637dfba3a93c01a5fa2c7",
-                    "nonce" : "0x646a583fed4773eb",
-                    "number" : "0x01",
-                    "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-                    "receiptTrie" : "0x882c12b553ee4f36742cfc92aecf3a1df1f394c0b6900ec20917313a9732c974",
-                    "stateRoot" : "0xdbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0882c12b553ee4f36742cfc92aecf3a1df1f394c0b6900ec20917313a9732c974b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a053f95098fb043e5f5f2a490d699de2f4952b9038091637dfba3a93c01a5fa2c788646a583fed4773ebf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x62e9e23cf9752cf4c980dfb2abedae18f44d50a17e7e2fda8930c9c6de0895dc",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3Fail_d0g1v0_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json",
-            "sourceHash" : "1da9cab21b29d4b74b49f30565ea62c34e1fa3185d076f9550b6490e85c46f1f"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0dbba0",
-                    "hash" : "0x283325bc503f28357e0dad7441b083d82e2bb6bfecc561110be5cfdd11b6764a",
-                    "mixHash" : "0xeacf14177b3f9bf48647f3520cb3253bd71cad2fae2fac22a854c5cf79e9c1a4",
-                    "nonce" : "0x705a9bac72a5a1ba",
-                    "number" : "0x01",
-                    "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-                    "receiptTrie" : "0xba028792fd3dabfff1ab342612d74e85e600b57141b88feae757c684a2808f0f",
-                    "stateRoot" : "0x77422fa6f6b833d197d88007f5697018073670ccd0a4be0e4f628fd3e4e9a47a",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa077422fa6f6b833d197d88007f5697018073670ccd0a4be0e4f628fd3e4e9a47aa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0ba028792fd3dabfff1ab342612d74e85e600b57141b88feae757c684a2808f0fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0eacf14177b3f9bf48647f3520cb3253bd71cad2fae2fac22a854c5cf79e9c1a488705a9bac72a5a1baf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x61ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dca",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x283325bc503f28357e0dad7441b083d82e2bb6bfecc561110be5cfdd11b6764a",
-        "network" : "Frontier",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callOutput3Fail_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3Fail_d0g1v0Filler.json",
-            "sourceHash" : "1da9cab21b29d4b74b49f30565ea62c34e1fa3185d076f9550b6490e85c46f1f"
+            "sourceHash" : "8c09b75d26f76e03c75cb41ed46f934ed7bc50adfc38e34e0f2ad660b37a76f2"
         },
         "blocks" : [
             {
@@ -503,9 +138,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0163c9",
-                    "hash" : "0xfbb08e12394a9c5ef8680a7e4c6f1b3ba4b7b535710311352a5e894581672cd2",
-                    "mixHash" : "0xf785d4704761cc2e6db8876117d652ba3e321d210b4b28f7fa65e38bc6e6d7c0",
-                    "nonce" : "0xdf20f0026fe5c3b3",
+                    "hash" : "0x649f4dacdc77cfe19be916bda711d118e8c09bb995d928328dbb8532f5839f57",
+                    "mixHash" : "0xe62ab63a50d4921609885040908c9098d062a2e7279537cd698029a00aaab6c9",
+                    "nonce" : "0x4121a2ab48348d25",
                     "number" : "0x01",
                     "parentHash" : "0x6ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036",
                     "receiptTrie" : "0x4f6d904ba8929e1e5a814182c608ca661ef0eea377a7f73f20601d67ecd5ad02",
@@ -514,10 +149,10 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a04f6d904ba8929e1e5a814182c608ca661ef0eea377a7f73f20601d67ecd5ad02b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163c98203e880a0f785d4704761cc2e6db8876117d652ba3e321d210b4b28f7fa65e38bc6e6d7c088df20f0026fe5c3b3f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a06ffbb55872e977420b9ac92735916941b8b18288c1a72f832230f7d05db3a036a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbd47777b6eccbf9c643747a3f16431258c72f69e4ba66fd8593d0755a086af6a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a04f6d904ba8929e1e5a814182c608ca661ef0eea377a7f73f20601d67ecd5ad02b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163c98203e880a0e62ab63a50d4921609885040908c9098d062a2e7279537cd698029a00aaab6c9884121a2ab48348d25f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0dbba0",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -551,7 +186,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa061ba6d9ae6c7024bd60812f414de46b68755d0459748c309b6de131893896dcaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfbb08e12394a9c5ef8680a7e4c6f1b3ba4b7b535710311352a5e894581672cd2",
+        "lastblockhash" : "0x649f4dacdc77cfe19be916bda711d118e8c09bb995d928328dbb8532f5839f57",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g0v0.json
index 8207335a3..eb682c424 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g0v0.json
@@ -2,10 +2,10 @@
     "callOutput3_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json",
-            "sourceHash" : "820e104d4857dcab34fa1b81971e052f43e9688c537fe447164ea045bef78dda"
+            "sourceHash" : "0dc569c5709827944079eb5c51f0a3a1d1f9a7bff3e3ae9530691a7aec3a026a"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xad20a2b46cc21fd7005b097a18505fe5fe9c738b9f3d906d77abcf5113afa15f",
-                    "mixHash" : "0x7e4c28a754826ffbbe8367304e524f4bdbf0c519d7549c1a9402a796ded5989d",
-                    "nonce" : "0xded203ab1de289c4",
+                    "hash" : "0x461c6e400792378a53f5c0bf334b58965bcc11da52c4b34281d227f4b55d601e",
+                    "mixHash" : "0x33e8639161e02bc50ebb9af2fd1db38a50726d79db273541c7169e6c20530469",
+                    "nonce" : "0x0ba5036abb8c7056",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05bba6d30b32673f34ab313edbf7dac6389f768ca71dcf5211481a67304a285f3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a07e4c28a754826ffbbe8367304e524f4bdbf0c519d7549c1a9402a796ded5989d88ded203ab1de289c4c0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05bba6d30b32673f34ab313edbf7dac6389f768ca71dcf5211481a67304a285f3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a033e8639161e02bc50ebb9af2fd1db38a50726d79db273541c7169e6c20530469880ba5036abb8c7056c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -53,7 +53,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xad20a2b46cc21fd7005b097a18505fe5fe9c738b9f3d906d77abcf5113afa15f",
+        "lastblockhash" : "0x461c6e400792378a53f5c0bf334b58965bcc11da52c4b34281d227f4b55d601e",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -109,343 +109,13 @@
             }
         }
     },
-    "callOutput3_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/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json",
-            "sourceHash" : "820e104d4857dcab34fa1b81971e052f43e9688c537fe447164ea045bef78dda"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x9446bcc988174210d12579de71102fcd7175c871b07fd94212b62224dd5f3e30",
-                    "mixHash" : "0x6a262bdf5cf09641fff5b789ceff870ab4966208ac5c7caa9eb0808b1b337b8a",
-                    "nonce" : "0xd7c2d229a3a25723",
-                    "number" : "0x01",
-                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a06a262bdf5cf09641fff5b789ceff870ab4966208ac5c7caa9eb0808b1b337b8a88d7c2d229a3a25723c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9446bcc988174210d12579de71102fcd7175c871b07fd94212b62224dd5f3e30",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3_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/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json",
-            "sourceHash" : "820e104d4857dcab34fa1b81971e052f43e9688c537fe447164ea045bef78dda"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x9846e5228df3ff65fd15aef75a7e9c41db7703427dd2a5bd68fe5bfe490b57a2",
-                    "mixHash" : "0x7c315ea144852de4fee08f78038e9f6dfaf8d88f6b4a723b3dc30299d1004291",
-                    "nonce" : "0x8f56e794fc51ac5c",
-                    "number" : "0x01",
-                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a07c315ea144852de4fee08f78038e9f6dfaf8d88f6b4a723b3dc30299d1004291888f56e794fc51ac5cc0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9846e5228df3ff65fd15aef75a7e9c41db7703427dd2a5bd68fe5bfe490b57a2",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3_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/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json",
-            "sourceHash" : "820e104d4857dcab34fa1b81971e052f43e9688c537fe447164ea045bef78dda"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0xcacf99d4072b25d049e3713011bc80b72696792d93cf3691355a19a17499a618",
-                    "mixHash" : "0x305b394faea8fc02f138a6b7129e70c58534e736b927dd9c548903ed86a1954b",
-                    "nonce" : "0x7eabada5fcc0cf04",
-                    "number" : "0x01",
-                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0305b394faea8fc02f138a6b7129e70c58534e736b927dd9c548903ed86a1954b887eabada5fcc0cf04c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcacf99d4072b25d049e3713011bc80b72696792d93cf3691355a19a17499a618",
-        "network" : "Frontier",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callOutput3_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g0v0Filler.json",
-            "sourceHash" : "820e104d4857dcab34fa1b81971e052f43e9688c537fe447164ea045bef78dda"
+            "sourceHash" : "0dc569c5709827944079eb5c51f0a3a1d1f9a7bff3e3ae9530691a7aec3a026a"
         },
         "blocks" : [
             {
@@ -456,9 +126,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xdfcc93a7000467ef62231f959d0571c77f5b1a41a2230f428d9f12964d7f1509",
-                    "mixHash" : "0xd2b6e386f7c8fdaab66d14e6f849114e80f97289202b7ae9c3631a054d478b8e",
-                    "nonce" : "0x7c528fd7075b3c24",
+                    "hash" : "0xcec31d203924426bb2368a3a38bf1aa06e60679a3f6285883f0ef1d851e31422",
+                    "mixHash" : "0x64a8d99b6d48bfbf84944335f1468fccd4377431024a9bab2310279c062e310b",
+                    "nonce" : "0x9e24183d9042d70b",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -467,7 +137,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d2b6e386f7c8fdaab66d14e6f849114e80f97289202b7ae9c3631a054d478b8e887c528fd7075b3c24c0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a064a8d99b6d48bfbf84944335f1468fccd4377431024a9bab2310279c062e310b889e24183d9042d70bc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -493,7 +163,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdfcc93a7000467ef62231f959d0571c77f5b1a41a2230f428d9f12964d7f1509",
+        "lastblockhash" : "0xcec31d203924426bb2368a3a38bf1aa06e60679a3f6285883f0ef1d851e31422",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g1v0.json
index 3dd7325de..ec3845044 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g1v0.json
@@ -2,10 +2,10 @@
     "callOutput3_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json",
-            "sourceHash" : "e455ae970e2604e9855d9f6d6b9016bf3a32c4df00978d257daf3388518ba4b9"
+            "sourceHash" : "0bd2aae0d67e88a5acc28b5a6e21593445ae8d472b055be52c9ab09b23f845ff"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0x67bc5b77b6ce9b7f45de61de80baf8edd0af0334213073616e63cd37849d5703",
-                    "mixHash" : "0xbdf3da2496e2ef1fbbefedd5892776c651e869e264e11113773117a034483c83",
-                    "nonce" : "0x6e84e075649e01f3",
+                    "hash" : "0x0dbe58d5a44bdc58134b34a244b18efbd6d50ce523eafb061a9741182d674869",
+                    "mixHash" : "0xa1b82694578ab9596f83f40659300942cefcdfc219a58d9a234f30e5798ff1e1",
+                    "nonce" : "0x7d72a5b8f54b15d6",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8bf0e598738366eee0ef52bf0547e836c060a169c46283790dca9227de0a1c8a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0bdf3da2496e2ef1fbbefedd5892776c651e869e264e11113773117a034483c83886e84e075649e01f3f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b8bf0e598738366eee0ef52bf0547e836c060a169c46283790dca9227de0a1c8a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0a1b82694578ab9596f83f40659300942cefcdfc219a58d9a234f30e5798ff1e1887d72a5b8f54b15d6f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0dbba0",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x67bc5b77b6ce9b7f45de61de80baf8edd0af0334213073616e63cd37849d5703",
+        "lastblockhash" : "0x0dbe58d5a44bdc58134b34a244b18efbd6d50ce523eafb061a9741182d674869",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -121,378 +121,13 @@
             }
         }
     },
-    "callOutput3_d0g1v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json",
-            "sourceHash" : "e455ae970e2604e9855d9f6d6b9016bf3a32c4df00978d257daf3388518ba4b9"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a1",
-                    "hash" : "0x63236786b090ab051082334b3a828d9a528f1cb3d91aae7afb87dde69915af70",
-                    "mixHash" : "0xfebb11b81d80e6d6c2b23d88481e054b6d3b3b84fa7935ec0addd307de5a0a56",
-                    "nonce" : "0x732973215cda0db8",
-                    "number" : "0x01",
-                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "0x19504ddf20cc56f4b63726af82ad9c96f00bfa6b8690240ea5a3b34adf2e3afc",
-                    "stateRoot" : "0x91c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a019504ddf20cc56f4b63726af82ad9c96f00bfa6b8690240ea5a3b34adf2e3afcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0febb11b81d80e6d6c2b23d88481e054b6d3b3b84fa7935ec0addd307de5a0a5688732973215cda0db8f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x63236786b090ab051082334b3a828d9a528f1cb3d91aae7afb87dde69915af70",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3_d0g1v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json",
-            "sourceHash" : "e455ae970e2604e9855d9f6d6b9016bf3a32c4df00978d257daf3388518ba4b9"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a1",
-                    "hash" : "0x663aa89ee27b2d78ba9921e775e2c2ec048d3f2e5bad878a4538cb271a2e0093",
-                    "mixHash" : "0xc249f2be5497ea307ef1994607dab2861b141f283802e85a6f8e36284d8dd410",
-                    "nonce" : "0x9b9e7e7213c6d8a6",
-                    "number" : "0x01",
-                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "0x69551036aa26370b3d032e1191070a5ca5aa17fff4a220cb3b08cc120e40115d",
-                    "stateRoot" : "0x91c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a069551036aa26370b3d032e1191070a5ca5aa17fff4a220cb3b08cc120e40115db90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0c249f2be5497ea307ef1994607dab2861b141f283802e85a6f8e36284d8dd410889b9e7e7213c6d8a6f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x663aa89ee27b2d78ba9921e775e2c2ec048d3f2e5bad878a4538cb271a2e0093",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3_d0g1v0_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json",
-            "sourceHash" : "e455ae970e2604e9855d9f6d6b9016bf3a32c4df00978d257daf3388518ba4b9"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0dbba0",
-                    "hash" : "0xb4ae57318368c456affbbd673383edcf9abeb9f242ba3e985979b64435503667",
-                    "mixHash" : "0xbfda2021390b83a8ffb15e63fd5c7076de848d74483cc87c8a3c0e246fb476f8",
-                    "nonce" : "0x6ffa0638ba98ba11",
-                    "number" : "0x01",
-                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "0x4e93a5b3332ffa98b8b08eb51d7b9b2c29924c2377e9ed4973758741698585ac",
-                    "stateRoot" : "0x40714d8cbcd554dada66ad8fb7db76237dc111bd449b3f28e1be2f06e4123d92",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa040714d8cbcd554dada66ad8fb7db76237dc111bd449b3f28e1be2f06e4123d92a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a04e93a5b3332ffa98b8b08eb51d7b9b2c29924c2377e9ed4973758741698585acb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0bfda2021390b83a8ffb15e63fd5c7076de848d74483cc87c8a3c0e246fb476f8886ffa0638ba98ba11f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb4ae57318368c456affbbd673383edcf9abeb9f242ba3e985979b64435503667",
-        "network" : "Frontier",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callOutput3_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3_d0g1v0Filler.json",
-            "sourceHash" : "e455ae970e2604e9855d9f6d6b9016bf3a32c4df00978d257daf3388518ba4b9"
+            "sourceHash" : "0bd2aae0d67e88a5acc28b5a6e21593445ae8d472b055be52c9ab09b23f845ff"
         },
         "blocks" : [
             {
@@ -503,9 +138,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb40d",
-                    "hash" : "0x56ddcee741dba03b56e079b19bbde7c479424bde0c5617f96e2c64d23bd23a29",
-                    "mixHash" : "0xe104b6e17e0b2c9fcbf09fb4d9d9a32e13881d0aaab3eec3680e07fa64124755",
-                    "nonce" : "0xbe1b9b62baf4d15e",
+                    "hash" : "0x42836a64c41f8a5ea368fcf620eb06f105c5d175354d5237d47c5e63ddb6f06b",
+                    "mixHash" : "0xdfa5f5c07ba0d184e33f6a8faacec562aebc0fa1c2d995c2d4018ef494df4995",
+                    "nonce" : "0xb0f929251b093c6b",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0xf25e63392d6fca436dc8dffcc04f4b37e25532d09f992d285d7f5b6668575a61",
@@ -514,10 +149,10 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0f25e63392d6fca436dc8dffcc04f4b37e25532d09f992d285d7f5b6668575a61b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a0e104b6e17e0b2c9fcbf09fb4d9d9a32e13881d0aaab3eec3680e07fa6412475588be1b9b62baf4d15ef865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa091c88590b56171d4f90c49d5d23fb559b37b807bb313179c977ea13d03174324a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0f25e63392d6fca436dc8dffcc04f4b37e25532d09f992d285d7f5b6668575a61b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a0dfa5f5c07ba0d184e33f6a8faacec562aebc0fa1c2d995c2d4018ef494df499588b0f929251b093c6bf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0dbba0",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -551,7 +186,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x56ddcee741dba03b56e079b19bbde7c479424bde0c5617f96e2c64d23bd23a29",
+        "lastblockhash" : "0x42836a64c41f8a5ea368fcf620eb06f105c5d175354d5237d47c5e63ddb6f06b",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0.json
index 4b9dafe67..8bd9efcf7 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0.json
@@ -2,10 +2,10 @@
     "callOutput3partialFail_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json",
-            "sourceHash" : "e96c99586b37fbda39df05b5c1d356947760003c64a220ea0069b1c455de18fc"
+            "sourceHash" : "ff623e005618eec6b9fa63146c40e98d0f861e3027bcc0a4e85a76ae64dc2565"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xf15000a7dc27b51725ce42b19b2ed1d0144d260ef631249f77c2e8d6450f2907",
-                    "mixHash" : "0xe44ce774610b5a4b6379fbd1d8efe642b384db8c92597b38706556205eea6287",
-                    "nonce" : "0x51e740916ab7f1c0",
+                    "hash" : "0x765cf03f000077c45b89bdf22db5788a43cafdecbaebf8443753a38f4d1a6d96",
+                    "mixHash" : "0xcb2a21d8a9342c073770956d8f969cb2fde82363129877262642c96ea4256fbd",
+                    "nonce" : "0x07d860ee42735db3",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2afc10b3e8a4b848c9c78a970a4eaf6c691b3091d2976ac8ac71a34783637e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0e44ce774610b5a4b6379fbd1d8efe642b384db8c92597b38706556205eea62878851e740916ab7f1c0c0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2afc10b3e8a4b848c9c78a970a4eaf6c691b3091d2976ac8ac71a34783637e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0cb2a21d8a9342c073770956d8f969cb2fde82363129877262642c96ea4256fbd8807d860ee42735db3c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -53,7 +53,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf15000a7dc27b51725ce42b19b2ed1d0144d260ef631249f77c2e8d6450f2907",
+        "lastblockhash" : "0x765cf03f000077c45b89bdf22db5788a43cafdecbaebf8443753a38f4d1a6d96",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -109,343 +109,13 @@
             }
         }
     },
-    "callOutput3partialFail_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/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json",
-            "sourceHash" : "e96c99586b37fbda39df05b5c1d356947760003c64a220ea0069b1c455de18fc"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0xa494af1ddf031fcb95a29937d62f5acca45b14346fa4c6583435116bcbc01f6b",
-                    "mixHash" : "0x7c228c35acf91b0b858fd1828bbda73fb52395c0b1125f84cb0a313db2d0b61b",
-                    "nonce" : "0xa49b252e9651720a",
-                    "number" : "0x01",
-                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a07c228c35acf91b0b858fd1828bbda73fb52395c0b1125f84cb0a313db2d0b61b88a49b252e9651720ac0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa494af1ddf031fcb95a29937d62f5acca45b14346fa4c6583435116bcbc01f6b",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3partialFail_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/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json",
-            "sourceHash" : "e96c99586b37fbda39df05b5c1d356947760003c64a220ea0069b1c455de18fc"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0xbd7536e883ac345c29cb6270abc16178844d63940816c740f0036d90cfdbdaeb",
-                    "mixHash" : "0xaea02536af2c156ba94d8eeae85b3f5087a4b49481d7568349a3a7a07fe4a170",
-                    "nonce" : "0x977e678d0cfbfd87",
-                    "number" : "0x01",
-                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0aea02536af2c156ba94d8eeae85b3f5087a4b49481d7568349a3a7a07fe4a17088977e678d0cfbfd87c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xbd7536e883ac345c29cb6270abc16178844d63940816c740f0036d90cfdbdaeb",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3partialFail_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/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json",
-            "sourceHash" : "e96c99586b37fbda39df05b5c1d356947760003c64a220ea0069b1c455de18fc"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x825b0236a8d682b8e609394f3be4e7691ee7c3dec69e83cb625102a9f8e1235a",
-                    "mixHash" : "0x02d20441bd14049615c78371a28301fdf762be6ad62eff2c6e05d5f5963c54de",
-                    "nonce" : "0x65903757d202dcd5",
-                    "number" : "0x01",
-                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a002d20441bd14049615c78371a28301fdf762be6ad62eff2c6e05d5f5963c54de8865903757d202dcd5c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x825b0236a8d682b8e609394f3be4e7691ee7c3dec69e83cb625102a9f8e1235a",
-        "network" : "Frontier",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callOutput3partialFail_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g0v0Filler.json",
-            "sourceHash" : "e96c99586b37fbda39df05b5c1d356947760003c64a220ea0069b1c455de18fc"
+            "sourceHash" : "ff623e005618eec6b9fa63146c40e98d0f861e3027bcc0a4e85a76ae64dc2565"
         },
         "blocks" : [
             {
@@ -456,9 +126,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xee597c2192c48e964eb9deb5a2ca497547922843180c4b2e183d3ead397d8154",
-                    "mixHash" : "0xb0c1795925ee4001034819fddc54c02cd4b649a475c4d3ad27493394d8dc47eb",
-                    "nonce" : "0xcc4b15cf7d5826ca",
+                    "hash" : "0x182ebd603202323f16d6df983ef69b49262a4f74a2ee2d34b271952bb2677852",
+                    "mixHash" : "0xf96469ff3d7fed9f009d298c1bd4d75b28cb57ca4f9ac10bb83d1283ea6972c2",
+                    "nonce" : "0xad7a00eb32a522c0",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -467,7 +137,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0b0c1795925ee4001034819fddc54c02cd4b649a475c4d3ad27493394d8dc47eb88cc4b15cf7d5826cac0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0f96469ff3d7fed9f009d298c1bd4d75b28cb57ca4f9ac10bb83d1283ea6972c288ad7a00eb32a522c0c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -493,7 +163,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xee597c2192c48e964eb9deb5a2ca497547922843180c4b2e183d3ead397d8154",
+        "lastblockhash" : "0x182ebd603202323f16d6df983ef69b49262a4f74a2ee2d34b271952bb2677852",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0.json
index 883c4fd06..a2e01edd3 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0.json
@@ -2,10 +2,10 @@
     "callOutput3partialFail_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json",
-            "sourceHash" : "3f5291829e642152732381f70001f1d8674c648d941f7861e489e65eb283c4bc"
+            "sourceHash" : "5a8138de00eb1e74c7d4e7db4c74bf025d9620835edc367928ac7f7a982feee3"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01665d",
-                    "hash" : "0x4ad8102e8904e11dd5657f97f3d9109678673df4a0d2b6d669d264194627e969",
-                    "mixHash" : "0xcd43438527657802ce76cd83e5536c91eba8843808c7d9c81737c9d2f6c5b147",
-                    "nonce" : "0x9d7e8abdfc609977",
+                    "hash" : "0xb51d0b9e6ce211330960067465cc2e30b90525794f93e7ab23b9d904283ac376",
+                    "mixHash" : "0x945dd1069cd8f83ba517a2e6a8b467c9f4f8a94bd40f8933741d14c825b57e1c",
+                    "nonce" : "0xb247924552d1e00c",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa064f6c7dc5dc0bbe41900673e806843a37451e8ac0e022903511f8f467733579aa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0cd43438527657802ce76cd83e5536c91eba8843808c7d9c81737c9d2f6c5b147889d7e8abdfc609977f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa064f6c7dc5dc0bbe41900673e806843a37451e8ac0e022903511f8f467733579aa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0835e171b6c8add0df6184b14ee2e55bba46f28763729bfcdf37e6119e584a834b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0945dd1069cd8f83ba517a2e6a8b467c9f4f8a94bd40f8933741d14c825b57e1c88b247924552d1e00cf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0dbba0",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4ad8102e8904e11dd5657f97f3d9109678673df4a0d2b6d669d264194627e969",
+        "lastblockhash" : "0xb51d0b9e6ce211330960067465cc2e30b90525794f93e7ab23b9d904283ac376",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -121,378 +121,13 @@
             }
         }
     },
-    "callOutput3partialFail_d0g1v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json",
-            "sourceHash" : "3f5291829e642152732381f70001f1d8674c648d941f7861e489e65eb283c4bc"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x01665d",
-                    "hash" : "0x4ac555427daf537b98c253aedf5598aa301f3073833c40c5d2e89ee1977e4731",
-                    "mixHash" : "0x2408b7241b76c0f976edc724197f685cf0addb71463969d05daa091c1ef8284c",
-                    "nonce" : "0x077df9e76f3a8d68",
-                    "number" : "0x01",
-                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "0x7e6328289be6e600d9730650482352fe9c48b0bc504d0bd7332a3d1bd8198d92",
-                    "stateRoot" : "0x470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a07e6328289be6e600d9730650482352fe9c48b0bc504d0bd7332a3d1bd8198d92b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a02408b7241b76c0f976edc724197f685cf0addb71463969d05daa091c1ef8284c88077df9e76f3a8d68f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4ac555427daf537b98c253aedf5598aa301f3073833c40c5d2e89ee1977e4731",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3partialFail_d0g1v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json",
-            "sourceHash" : "3f5291829e642152732381f70001f1d8674c648d941f7861e489e65eb283c4bc"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x01665d",
-                    "hash" : "0x65e4e52cd95c9cc008e8f1c1d3aedc3816d453f95552dc386eec08f02d58281d",
-                    "mixHash" : "0xeab88fbc23018ee72dff27132dba701e6bf98847d25c23b96e4b2249c6b2e5a8",
-                    "nonce" : "0x2494373907d64a62",
-                    "number" : "0x01",
-                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "0x36fe85837ed3a4b5654a17745d99463d7c27c94a1a6e7f51e4abcd3d3e0eec7b",
-                    "stateRoot" : "0x470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a036fe85837ed3a4b5654a17745d99463d7c27c94a1a6e7f51e4abcd3d3e0eec7bb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301665d8203e880a0eab88fbc23018ee72dff27132dba701e6bf98847d25c23b96e4b2249c6b2e5a8882494373907d64a62f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x65e4e52cd95c9cc008e8f1c1d3aedc3816d453f95552dc386eec08f02d58281d",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3partialFail_d0g1v0_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json",
-            "sourceHash" : "3f5291829e642152732381f70001f1d8674c648d941f7861e489e65eb283c4bc"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0dbba0",
-                    "hash" : "0x4df11645edb7b78f766bc951e4ee2408366470e8053b73b05e0366816fc51bda",
-                    "mixHash" : "0x2845ee2535e27e957bc020a688923f5d2931fb5a05b5ec4935bddb5b92366e0f",
-                    "nonce" : "0xa00c2597d842ce2c",
-                    "number" : "0x01",
-                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "0x7693cb5d09cbcd5596e3dfc3cca7c62c8c5b6aefb20c3007811eab600f7471ff",
-                    "stateRoot" : "0xf28b5fbd9331c485dc469c58d550dd0c7ada6468594e7aa47b35b9ab8127c382",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f28b5fbd9331c485dc469c58d550dd0c7ada6468594e7aa47b35b9ab8127c382a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a07693cb5d09cbcd5596e3dfc3cca7c62c8c5b6aefb20c3007811eab600f7471ffb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a02845ee2535e27e957bc020a688923f5d2931fb5a05b5ec4935bddb5b92366e0f88a00c2597d842ce2cf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4df11645edb7b78f766bc951e4ee2408366470e8053b73b05e0366816fc51bda",
-        "network" : "Frontier",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callOutput3partialFail_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partialFail_d0g1v0Filler.json",
-            "sourceHash" : "3f5291829e642152732381f70001f1d8674c648d941f7861e489e65eb283c4bc"
+            "sourceHash" : "5a8138de00eb1e74c7d4e7db4c74bf025d9620835edc367928ac7f7a982feee3"
         },
         "blocks" : [
             {
@@ -503,9 +138,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0163c9",
-                    "hash" : "0xfcee9c72ef83966383ea80d3efb68bfc94caad05980071ebecf2e34a32347c41",
-                    "mixHash" : "0x01d6130c9732931f870e9d2967910959922986e370ccd409d9f998fc6748b214",
-                    "nonce" : "0x3cd711c459ef0c76",
+                    "hash" : "0x0dde03c0ae5441bf206f6e29ba6cdc22053fcf61419cfb9e445078c5daf0a6d9",
+                    "mixHash" : "0xb3212ec2a0824cfea3a9ee7009312d18fd35377deb2a22b627702f6eb1cf7763",
+                    "nonce" : "0x7d00ce90b8c9dfca",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x747aa3169dc0aae44a6acd721ec67c9d66866d215818c91953393b518899f4f4",
@@ -514,10 +149,10 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0747aa3169dc0aae44a6acd721ec67c9d66866d215818c91953393b518899f4f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163c98203e880a001d6130c9732931f870e9d2967910959922986e370ccd409d9f998fc6748b214883cd711c459ef0c76f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90263f901f8a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0470e2d70220b848914748f3fed21434129cec6f3c19c17e32927bc609d3fa290a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0747aa3169dc0aae44a6acd721ec67c9d66866d215818c91953393b518899f4f4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830163c98203e880a0b3212ec2a0824cfea3a9ee7009312d18fd35377deb2a22b627702f6eb1cf7763887d00ce90b8c9dfcaf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0dbba0",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -551,7 +186,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfcee9c72ef83966383ea80d3efb68bfc94caad05980071ebecf2e34a32347c41",
+        "lastblockhash" : "0x0dde03c0ae5441bf206f6e29ba6cdc22053fcf61419cfb9e445078c5daf0a6d9",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g0v0.json
index 1be3d2ab1..5ef236c76 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g0v0.json
@@ -2,10 +2,10 @@
     "callOutput3partial_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json",
-            "sourceHash" : "d36e5bb9c898f0f016d905e4c33b992cc5573254c1b8e39f70d5d28da4fd6324"
+            "sourceHash" : "4f1a045ec45dbdcc1b19d0a184489c4b3ed090862f066af73477ce0cac0822ab"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xd1776e042dfc898899ed48b92e8008fa15c00a861aa73fa938ec8f0460039068",
-                    "mixHash" : "0x43eae9e3a8e541c16f5778786d6ab0b79d35f0aa9ced80901bf1cec963fd812a",
-                    "nonce" : "0x451d6679809fd97f",
+                    "hash" : "0x1dc886e9d69da2325c962c07b7513e3eecaba62bbb8d52f70e1a7275184c9cc8",
+                    "mixHash" : "0x465abe68a11ed6c0e1ed485de1e82f7eb27b056a1683f3323c1c5b7f6e99d443",
+                    "nonce" : "0x9b1eb0e10bdb1c37",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01af36e1ffb0080e322d10ee6072a6dfc353a93a1d39c925b39171632b2bd7841a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a043eae9e3a8e541c16f5778786d6ab0b79d35f0aa9ced80901bf1cec963fd812a88451d6679809fd97fc0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01af36e1ffb0080e322d10ee6072a6dfc353a93a1d39c925b39171632b2bd7841a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0465abe68a11ed6c0e1ed485de1e82f7eb27b056a1683f3323c1c5b7f6e99d443889b1eb0e10bdb1c37c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -53,7 +53,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd1776e042dfc898899ed48b92e8008fa15c00a861aa73fa938ec8f0460039068",
+        "lastblockhash" : "0x1dc886e9d69da2325c962c07b7513e3eecaba62bbb8d52f70e1a7275184c9cc8",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -109,343 +109,13 @@
             }
         }
     },
-    "callOutput3partial_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/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json",
-            "sourceHash" : "d36e5bb9c898f0f016d905e4c33b992cc5573254c1b8e39f70d5d28da4fd6324"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x77362845a94abae66135d0a41f73e9ef55692186fa323fa63faa9b4cea8fa5cc",
-                    "mixHash" : "0x37fc306afdced2e2bbe52052f4823562cb98796e9c3ffc4c75e0aac2d57f3ac9",
-                    "nonce" : "0x7ae8b6f020c39851",
-                    "number" : "0x01",
-                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xabb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a037fc306afdced2e2bbe52052f4823562cb98796e9c3ffc4c75e0aac2d57f3ac9887ae8b6f020c39851c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x77362845a94abae66135d0a41f73e9ef55692186fa323fa63faa9b4cea8fa5cc",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3partial_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/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json",
-            "sourceHash" : "d36e5bb9c898f0f016d905e4c33b992cc5573254c1b8e39f70d5d28da4fd6324"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0xcccad26e27f314ee13345deb301d8a010ccd0000c21f254c97dfa42252679964",
-                    "mixHash" : "0xaf6d8d0e7e4ebf1a5295da2e682d7ae2ad997af57d0657d7ef6b50fee56c3c33",
-                    "nonce" : "0x1663976cf12196f9",
-                    "number" : "0x01",
-                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xabb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0af6d8d0e7e4ebf1a5295da2e682d7ae2ad997af57d0657d7ef6b50fee56c3c33881663976cf12196f9c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcccad26e27f314ee13345deb301d8a010ccd0000c21f254c97dfa42252679964",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3partial_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/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json",
-            "sourceHash" : "d36e5bb9c898f0f016d905e4c33b992cc5573254c1b8e39f70d5d28da4fd6324"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x72ab2bbc7a21ee5396f4a659155be97a3ec1ce7ad1f5705587535abd80d56b6b",
-                    "mixHash" : "0x1313e786c91bc0968cb5db4bb8be890b883346c240c613f45f165ca4470e281c",
-                    "nonce" : "0x6f278f36368353b1",
-                    "number" : "0x01",
-                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xabb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a01313e786c91bc0968cb5db4bb8be890b883346c240c613f45f165ca4470e281c886f278f36368353b1c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x72ab2bbc7a21ee5396f4a659155be97a3ec1ce7ad1f5705587535abd80d56b6b",
-        "network" : "Frontier",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callOutput3partial_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g0v0Filler.json",
-            "sourceHash" : "d36e5bb9c898f0f016d905e4c33b992cc5573254c1b8e39f70d5d28da4fd6324"
+            "sourceHash" : "4f1a045ec45dbdcc1b19d0a184489c4b3ed090862f066af73477ce0cac0822ab"
         },
         "blocks" : [
             {
@@ -456,9 +126,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x61427ebae7800910bdee1e2ea01fa12f669b9630deb8ba0ad2dd62beb14c8442",
-                    "mixHash" : "0x4bd8b4ae18bb04a641194bd15bc22b8ae97b82fc75d61aa500e25221a5ac1fdf",
-                    "nonce" : "0x78fae86c04445d70",
+                    "hash" : "0xcfd65420012541f07f28c658769e98b045e0e5ff6768a9f239516f849e256b67",
+                    "mixHash" : "0xacdbf29368b0c148fd994a36c8c096765768e4194f35d9dddd67276737c0d1db",
+                    "nonce" : "0x06e3ea4eb581c70a",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -467,7 +137,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a04bd8b4ae18bb04a641194bd15bc22b8ae97b82fc75d61aa500e25221a5ac1fdf8878fae86c04445d70c0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0acdbf29368b0c148fd994a36c8c096765768e4194f35d9dddd67276737c0d1db8806e3ea4eb581c70ac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -493,7 +163,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x61427ebae7800910bdee1e2ea01fa12f669b9630deb8ba0ad2dd62beb14c8442",
+        "lastblockhash" : "0xcfd65420012541f07f28c658769e98b045e0e5ff6768a9f239516f849e256b67",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g1v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g1v0.json
index eeaefa4ff..a20ed0260 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g1v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g1v0.json
@@ -2,10 +2,10 @@
     "callOutput3partial_d0g1v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json",
-            "sourceHash" : "358946d1d18b9c843aebe9f113a89737e9e0c102e7266b382dea50538a756305"
+            "sourceHash" : "3664d68a91bfe8bab72409ee8116afbfbd5ef68cbe038aadfa92ccffd83773c4"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb6a1",
-                    "hash" : "0x8a8f8ab76305b6f9066fbf58947035bb2a3793f64eb7a629f8cb6337230b4215",
-                    "mixHash" : "0x621d6c21b306d3f14d19c8572e8bd3125987b1740827321745f81967a7126048",
-                    "nonce" : "0xe8d97a8585714a2d",
+                    "hash" : "0xc605fa55179b8d852a9a8ea1f1b7e779102b486beccf6884d003e99d041e651d",
+                    "mixHash" : "0x056e991fa91d4dfbd39702b73997cd39f8462cfc791a2f05d348391d3339dbfb",
+                    "nonce" : "0x6540df34c9ab389c",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x03fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c50ef7cdfede30353ca0a2e5583a77eceb64a69a38b9b54b2c345d478fc61aea0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0621d6c21b306d3f14d19c8572e8bd3125987b1740827321745f81967a712604888e8d97a8585714a2df865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c50ef7cdfede30353ca0a2e5583a77eceb64a69a38b9b54b2c345d478fc61aea0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a003fa70c11319db3b12b1eb9d15d531c56072c9f222bfcc6824a3458840cf7da7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0056e991fa91d4dfbd39702b73997cd39f8462cfc791a2f05d348391d3339dbfb886540df34c9ab389cf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0dbba0",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8a8f8ab76305b6f9066fbf58947035bb2a3793f64eb7a629f8cb6337230b4215",
+        "lastblockhash" : "0xc605fa55179b8d852a9a8ea1f1b7e779102b486beccf6884d003e99d041e651d",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -121,378 +121,13 @@
             }
         }
     },
-    "callOutput3partial_d0g1v0_EIP150" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json",
-            "sourceHash" : "358946d1d18b9c843aebe9f113a89737e9e0c102e7266b382dea50538a756305"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a1",
-                    "hash" : "0x29f638c70bba77bf883b21bd1f8498584d84e5baa62a1a094422a550a041e572",
-                    "mixHash" : "0xf2eea358de89e34f88b671e26c171aae069ec43fffeec3ea7c8c69e79ed793b2",
-                    "nonce" : "0x8b3732bdd2502a76",
-                    "number" : "0x01",
-                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "0x385b829c64f0c308fd2437407c2e2b3854a8486d49360c197dac9135b0d3d2de",
-                    "stateRoot" : "0x380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365f",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0385b829c64f0c308fd2437407c2e2b3854a8486d49360c197dac9135b0d3d2deb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0f2eea358de89e34f88b671e26c171aae069ec43fffeec3ea7c8c69e79ed793b2888b3732bdd2502a76f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x29f638c70bba77bf883b21bd1f8498584d84e5baa62a1a094422a550a041e572",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3partial_d0g1v0_EIP158" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json",
-            "sourceHash" : "358946d1d18b9c843aebe9f113a89737e9e0c102e7266b382dea50538a756305"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xb6a1",
-                    "hash" : "0xf88004066fe405b62b74bc514035ca9964534744ee57e694b11ec60fdb5413d5",
-                    "mixHash" : "0xb029009ff770ee80e2478064a73856b1591ff68362bcb599f95ca7693b5d703e",
-                    "nonce" : "0xe33ea38157e07a29",
-                    "number" : "0x01",
-                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "0x9ab198abbbd0234efcc8ca77c6b8235541aff8975ef288a023e5df061eec198f",
-                    "stateRoot" : "0x380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365f",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a09ab198abbbd0234efcc8ca77c6b8235541aff8975ef288a023e5df061eec198fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b6a18203e880a0b029009ff770ee80e2478064a73856b1591ff68362bcb599f95ca7693b5d703e88e33ea38157e07a29f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xf88004066fe405b62b74bc514035ca9964534744ee57e694b11ec60fdb5413d5",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7627960",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callOutput3partial_d0g1v0_Frontier" : {
-        "_info" : {
-            "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json",
-            "sourceHash" : "358946d1d18b9c843aebe9f113a89737e9e0c102e7266b382dea50538a756305"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0dbba0",
-                    "hash" : "0x73316b7b2f5206952d36ff786a2d936a4e91f21ab1780a346daa9a7abadaa6c6",
-                    "mixHash" : "0x019869fb1126737f5747b0d21b906367d6f176da8140243f8da4493c8530a40b",
-                    "nonce" : "0x936a512235d37728",
-                    "number" : "0x01",
-                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "0x8fb9a48d94f65bfe53a71d85606cc57f3dbf356979b98cdaa7eb14e798eb0316",
-                    "stateRoot" : "0xb9975212993f6f5f05d56e6bdfe4f8bb84987d091c4bfecbf6605aabd4c22752",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b9975212993f6f5f05d56e6bdfe4f8bb84987d091c4bfecbf6605aabd4c22752a0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a08fb9a48d94f65bfe53a71d85606cc57f3dbf356979b98cdaa7eb14e798eb0316b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830dbba08203e880a0019869fb1126737f5747b0d21b906367d6f176da8140243f8da4493c8530a40b88936a512235d37728f865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x0dbba0",
-                        "gasPrice" : "0x00",
-                        "nonce" : "0x00",
-                        "r" : "0xa454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1",
-                        "s" : "0x55bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277e",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x73316b7b2f5206952d36ff786a2d936a4e91f21ab1780a346daa9a7abadaa6c6",
-        "network" : "Frontier",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callOutput3partial_d0g1v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callOutput3partial_d0g1v0Filler.json",
-            "sourceHash" : "358946d1d18b9c843aebe9f113a89737e9e0c102e7266b382dea50538a756305"
+            "sourceHash" : "3664d68a91bfe8bab72409ee8116afbfbd5ef68cbe038aadfa92ccffd83773c4"
         },
         "blocks" : [
             {
@@ -503,9 +138,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xb40d",
-                    "hash" : "0x7e646882cc53f64e0a0f99933f06d240030d754903b328aae236ec9f798315e8",
-                    "mixHash" : "0xeef7233c74f51b4db011e74f0ef58d06b3539144332cd1e01a2941820cf1f7af",
-                    "nonce" : "0x622659f7be22402d",
+                    "hash" : "0xe435b1e52ae0e97837d1307b01f6e3145ec3423ad4f3f0d6e843bc7acb269556",
+                    "mixHash" : "0x6e70ddaef300d665c90c8cee0caf648c420f5dc506de547c2ae6593bd28d9705",
+                    "nonce" : "0x0898aca0e6a9f46c",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x946ff619b1f8eabfcba9b8559b340e7a79986156697913cde5cfdf9e0ea2258a",
@@ -514,10 +149,10 @@
                     "transactionsTrie" : "0xafadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0946ff619b1f8eabfcba9b8559b340e7a79986156697913cde5cfdf9e0ea2258ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a0eef7233c74f51b4db011e74f0ef58d06b3539144332cd1e01a2941820cf1f7af88622659f7be22402df865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
+                "rlp" : "0xf90262f901f7a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0380bf0504ad08717440d6da5b0f5667484424aef10d1e7ba5b826c937449365fa0afadb40fdc167bd49a94e105dec7cc27af9ddfbc855affa7d15072d7c93d89a2a0946ff619b1f8eabfcba9b8559b340e7a79986156697913cde5cfdf9e0ea2258ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082b40d8203e880a06e70ddaef300d665c90c8cee0caf648c420f5dc506de547c2ae6593bd28d9705880898aca0e6a9f46cf865f8638080830dbba094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba0a454127f0a7efbc07c27b65a9bd76ebf8189d032a43b7a8f81327c2371ad79f1a055bd50638e18dafa3a23707e89dbe830f00f109e771774bb5db2c7b44be2277ec0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x0dbba0",
                         "gasPrice" : "0x00",
                         "nonce" : "0x00",
@@ -551,7 +186,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7e646882cc53f64e0a0f99933f06d240030d754903b328aae236ec9f798315e8",
+        "lastblockhash" : "0xe435b1e52ae0e97837d1307b01f6e3145ec3423ad4f3f0d6e843bc7acb269556",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0.json
index 71670d721..6a726ae74 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0.json
@@ -2,10 +2,10 @@
     "callWithHighValueAndGasOOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "ea2ba76053a12b5831ffb8409c264e5d25e58c1d7175b30e25d0e3562272171c"
+            "sourceHash" : "4f32b8dadeee5fd35ab31734c881b2fb50d5c028f01a3e15f3bdb08e84253232"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf149",
-                    "hash" : "0x163b9e8fcdaba50fab8a4aad6aa2f869083b17da4c696eccc8819b5195e2ac02",
-                    "mixHash" : "0xb1e786abbf94bafbd37b7e6ec1f462e66155a8364eb5e9940ff5cf77ffe4f7c0",
-                    "nonce" : "0x53ceb061f95c1bcc",
+                    "hash" : "0x6000a334024da38297a25bea29bf925442fbae32afee6a4d823db957334664f4",
+                    "mixHash" : "0xbb551a7273f4921b3744b0c5b4db1f25277ab0bee8137a02fbc5ea74b60164df",
+                    "nonce" : "0xed99d2709d112d74",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ea77f52a4e76756cdd0d5ddec2aa2c2e96fc172b42a3ffa3a650f5ffd756635a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0b1e786abbf94bafbd37b7e6ec1f462e66155a8364eb5e9940ff5cf77ffe4f7c08853ceb061f95c1bccf865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ea77f52a4e76756cdd0d5ddec2aa2c2e96fc172b42a3ffa3a650f5ffd756635a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a0bb551a7273f4921b3744b0c5b4db1f25277ab0bee8137a02fbc5ea74b60164df88ed99d2709d112d74f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x163b9e8fcdaba50fab8a4aad6aa2f869083b17da4c696eccc8819b5195e2ac02",
+        "lastblockhash" : "0x6000a334024da38297a25bea29bf925442fbae32afee6a4d823db957334664f4",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -122,380 +122,13 @@
             }
         }
     },
-    "callWithHighValueAndGasOOG_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/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "ea2ba76053a12b5831ffb8409c264e5d25e58c1d7175b30e25d0e3562272171c"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf149",
-                    "hash" : "0x01928c4f08bc50a69fdc104dba52af318e148bb355b4de987574ec3ea5e6c4cf",
-                    "mixHash" : "0x0c565b9d22a8c6a5be5cd86bd1c62095f6f8912f27e950904a7b4bb1774c1240",
-                    "nonce" : "0xb9a8e6e1068fcf0c",
-                    "number" : "0x01",
-                    "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-                    "receiptTrie" : "0xe436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067",
-                    "stateRoot" : "0x12711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a00c565b9d22a8c6a5be5cd86bd1c62095f6f8912f27e950904a7b4bb1774c124088b9a8e6e1068fcf0cf865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x8096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22e",
-                        "s" : "0x167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6d",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x4bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x01928c4f08bc50a69fdc104dba52af318e148bb355b4de987574ec3ea5e6c4cf",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f149",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618817",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callWithHighValueAndGasOOG_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/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "ea2ba76053a12b5831ffb8409c264e5d25e58c1d7175b30e25d0e3562272171c"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf149",
-                    "hash" : "0xb8bf8419f79bcc23cf5f4bb689df4b54cca5828e4871333d893e94c9f4338202",
-                    "mixHash" : "0x69c538eabb6c38758a1c783f2097e68bced282ea04e2004760ee5ca047318c95",
-                    "nonce" : "0x87c1f5f9eac08a9f",
-                    "number" : "0x01",
-                    "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-                    "receiptTrie" : "0xe436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067",
-                    "stateRoot" : "0x12711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a069c538eabb6c38758a1c783f2097e68bced282ea04e2004760ee5ca047318c958887c1f5f9eac08a9ff865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x8096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22e",
-                        "s" : "0x167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6d",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x4bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb8bf8419f79bcc23cf5f4bb689df4b54cca5828e4871333d893e94c9f4338202",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f149",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618817",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callWithHighValueAndGasOOG_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/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "ea2ba76053a12b5831ffb8409c264e5d25e58c1d7175b30e25d0e3562272171c"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x2dc6c0",
-                    "hash" : "0xfa77f086a0a1292fcecb07b3b05451be9ae14099bd1a019a3680607d95826040",
-                    "mixHash" : "0x407b4494dd41d19fa7a8b50b6fdbf9fd6f6879f55fb6aab221ab6d598d927f18",
-                    "nonce" : "0x2e637451c6b8764e",
-                    "number" : "0x01",
-                    "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-                    "receiptTrie" : "0x08ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7",
-                    "stateRoot" : "0xde336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553c",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0407b4494dd41d19fa7a8b50b6fdbf9fd6f6879f55fb6aab221ab6d598d927f18882e637451c6b8764ef865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x8096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22e",
-                        "s" : "0x167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6d",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x4bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfa77f086a0a1292fcecb07b3b05451be9ae14099bd1a019a3680607d95826040",
-        "network" : "Frontier",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824521c6c0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7363940",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callWithHighValueAndGasOOG_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callWithHighValueAndGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "ea2ba76053a12b5831ffb8409c264e5d25e58c1d7175b30e25d0e3562272171c"
+            "sourceHash" : "4f32b8dadeee5fd35ab31734c881b2fb50d5c028f01a3e15f3bdb08e84253232"
         },
         "blocks" : [
             {
@@ -506,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0xe1b0d202b6a20f46853469512ef4173bbf233f4ef301ee4906d253e9c52de01f",
-                    "mixHash" : "0xef0c80376b9e7c5397867e86b6aeb14b82fbcd74b23799d1bbbf9883b7f1396f",
-                    "nonce" : "0xd657f8c2094073a8",
+                    "hash" : "0x4e188cdf748953e352e224cd90270b792a702386602950143607864375b74565",
+                    "mixHash" : "0x58ebbb46912ff1b29da3f677f2c55ac63dc8e5cf5a99b61e9d7fc58e54818435",
+                    "nonce" : "0xaf3f24fb7f927b68",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0x08ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7",
@@ -517,10 +150,10 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0ef0c80376b9e7c5397867e86b6aeb14b82fbcd74b23799d1bbbf9883b7f1396f88d657f8c2094073a8f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a058ebbb46912ff1b29da3f677f2c55ac63dc8e5cf5a99b61e9d7fc58e5481843588af3f24fb7f927b68f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -554,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe1b0d202b6a20f46853469512ef4173bbf233f4ef301ee4906d253e9c52de01f",
+        "lastblockhash" : "0x4e188cdf748953e352e224cd90270b792a702386602950143607864375b74565",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0.json
index 0bf6c5447..d3ac353ba 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodeOutput1_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json",
-            "sourceHash" : "c445914f3b9e220748b1c5d7a940e6eeb5a223cebddd84a5449f290ab6575d19"
+            "sourceHash" : "cda3266071b0be4d71c7ddfa46d804df007fb96932e87b3d448cb15fd259ab52"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x77b7af24ae944873704b7f0f5ed46ca726f760859a59584bef6233d554cfc087",
-                    "mixHash" : "0xae658795ca393bbc96739512454af51d9ee7fb4c591a0026d2cb4e0526336700",
-                    "nonce" : "0x41483a5f8e99a162",
+                    "hash" : "0x37310074292ddb193656ecb9aa7401b27635f87a86a143cc5e79e437258c7c79",
+                    "mixHash" : "0x0cf90a4c47795a4ba685674027fe2d7bd8d53584065a68a542f2b3b2e3651f86",
+                    "nonce" : "0xfcde8a51d9de50bc",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00212d941445e50a5d7ddd13d42662a4e3314952a7805c20f68d9b2cf8b583b3aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ae658795ca393bbc96739512454af51d9ee7fb4c591a0026d2cb4e05263367008841483a5f8e99a162c0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00212d941445e50a5d7ddd13d42662a4e3314952a7805c20f68d9b2cf8b583b3aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a00cf90a4c47795a4ba685674027fe2d7bd8d53584065a68a542f2b3b2e3651f8688fcde8a51d9de50bcc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -53,7 +53,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x77b7af24ae944873704b7f0f5ed46ca726f760859a59584bef6233d554cfc087",
+        "lastblockhash" : "0x37310074292ddb193656ecb9aa7401b27635f87a86a143cc5e79e437258c7c79",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -109,343 +109,13 @@
             }
         }
     },
-    "callcodeOutput1_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/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json",
-            "sourceHash" : "c445914f3b9e220748b1c5d7a940e6eeb5a223cebddd84a5449f290ab6575d19"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x995eeec45aa9e06d1551e58729421216b6cd85c165a79ea1a3ba840db80dbe53",
-                    "mixHash" : "0xa88398fe50b8b9d95c21a6981911df0777b03292b43d08edc506d0f9d1a0c807",
-                    "nonce" : "0x492d4a3fdfd4691f",
-                    "number" : "0x01",
-                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xdbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0a88398fe50b8b9d95c21a6981911df0777b03292b43d08edc506d0f9d1a0c80788492d4a3fdfd4691fc0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x995eeec45aa9e06d1551e58729421216b6cd85c165a79ea1a3ba840db80dbe53",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodeOutput1_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/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json",
-            "sourceHash" : "c445914f3b9e220748b1c5d7a940e6eeb5a223cebddd84a5449f290ab6575d19"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0xfd0a6a1db9a187a298241abfca556db99f7f482b89ddc14877eb8d385622b59e",
-                    "mixHash" : "0xbd453e17a2336df2628f41cb8f033a3b4f848c13fa0b622733ea683e471ca808",
-                    "nonce" : "0x5642f44b7d4ff11f",
-                    "number" : "0x01",
-                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xdbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0bd453e17a2336df2628f41cb8f033a3b4f848c13fa0b622733ea683e471ca808885642f44b7d4ff11fc0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xfd0a6a1db9a187a298241abfca556db99f7f482b89ddc14877eb8d385622b59e",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodeOutput1_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/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json",
-            "sourceHash" : "c445914f3b9e220748b1c5d7a940e6eeb5a223cebddd84a5449f290ab6575d19"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x6d6029f7bab8e44c70d3cd18fe9c499e1c526b2d2a7c6e4975ce7664f48351f5",
-                    "mixHash" : "0x21ef22af2b857f1e768d15ad503a63bbbe3be6f627c1f070dec7210b454b857c",
-                    "nonce" : "0x28ea101f04772103",
-                    "number" : "0x01",
-                    "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xdbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720c",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a021ef22af2b857f1e768d15ad503a63bbbe3be6f627c1f070dec7210b454b857c8828ea101f04772103c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x06d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6d6029f7bab8e44c70d3cd18fe9c499e1c526b2d2a7c6e4975ce7664f48351f5",
-        "network" : "Frontier",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodeOutput1_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput1_d0g0v0Filler.json",
-            "sourceHash" : "c445914f3b9e220748b1c5d7a940e6eeb5a223cebddd84a5449f290ab6575d19"
+            "sourceHash" : "cda3266071b0be4d71c7ddfa46d804df007fb96932e87b3d448cb15fd259ab52"
         },
         "blocks" : [
             {
@@ -456,9 +126,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x195ab1a0eb18c9da80667d69deb3fdf20101009c7e1ec99121caaf0500bbcb75",
-                    "mixHash" : "0x824f5a336350b769d3b1ac560aba073aede6a9f71765a7f9c1025c4b554926db",
-                    "nonce" : "0x3ba854c1210b635c",
+                    "hash" : "0x00f25ac1bf18caa09c6a9f77aa0682aaa809fad7012a151f7f79c4a52b144a59",
+                    "mixHash" : "0x586ea9839bd0c0621d6e27ca94a75e6144ab1c165f63b2d1d6c94d4850be62ee",
+                    "nonce" : "0x9e7e37655d1c6c44",
                     "number" : "0x01",
                     "parentHash" : "0x7e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -467,7 +137,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0824f5a336350b769d3b1ac560aba073aede6a9f71765a7f9c1025c4b554926db883ba854c1210b635cc0c0",
+                "rlp" : "0xf901faf901f5a07e2b26f655fabea4affb36f69626fb8c411306f89bcc68fa370e009970fab884a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dbce7c64c3dc02eea92d48981df1ab265821c7a656e864ead115fb97f080720ca056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0586ea9839bd0c0621d6e27ca94a75e6144ab1c165f63b2d1d6c94d4850be62ee889e7e37655d1c6c44c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -493,7 +163,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa006d2ec985e0fb09df5041c16dcc89a07ca981c6a3cee8373b879187172c09b6da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x195ab1a0eb18c9da80667d69deb3fdf20101009c7e1ec99121caaf0500bbcb75",
+        "lastblockhash" : "0x00f25ac1bf18caa09c6a9f77aa0682aaa809fad7012a151f7f79c4a52b144a59",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0.json
index 8cdb62a36..097450247 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodeOutput2_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json",
-            "sourceHash" : "89ad23b0f07493c27f058d0a5790c37f11c8bcdb3a12b16400544692e83f7efe"
+            "sourceHash" : "57628bb0d764a3c54b71b62ccb416e8237bb30147af149d254d179a1f266b5f8"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xc0967b29187b80b5d7e84d063abc9ae3f2bf6ef4cfcac9df8af9c42ec4472a5b",
-                    "mixHash" : "0x0bd024321077e45c59cdc51098b5759df876295d5b7a897c341297e0ab93ed91",
-                    "nonce" : "0xfe4fd6f305a03f6e",
+                    "hash" : "0xcd78d2baef54ee8808ce6589906d95224690b0f29eaac125cd7a688f56bb05c8",
+                    "mixHash" : "0xeb3f4e2c8684368ebe5eb0bcff81f6e392266e12efb692f12bc834c18961f466",
+                    "nonce" : "0x9d3431eb699b7a03",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045318ecda8b462e518f8b882df13be24a4e39ce872ca313cd7e3ee67c522c306a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a00bd024321077e45c59cdc51098b5759df876295d5b7a897c341297e0ab93ed9188fe4fd6f305a03f6ec0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa045318ecda8b462e518f8b882df13be24a4e39ce872ca313cd7e3ee67c522c306a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0eb3f4e2c8684368ebe5eb0bcff81f6e392266e12efb692f12bc834c18961f466889d3431eb699b7a03c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -53,7 +53,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc0967b29187b80b5d7e84d063abc9ae3f2bf6ef4cfcac9df8af9c42ec4472a5b",
+        "lastblockhash" : "0xcd78d2baef54ee8808ce6589906d95224690b0f29eaac125cd7a688f56bb05c8",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -109,343 +109,13 @@
             }
         }
     },
-    "callcodeOutput2_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/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json",
-            "sourceHash" : "89ad23b0f07493c27f058d0a5790c37f11c8bcdb3a12b16400544692e83f7efe"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0xe02c1f40f43ec481ef4f2f5b16c30efa441e1871914eb1c98be8e8539493cbc6",
-                    "mixHash" : "0x07e514d7e366d5122990373be42ff36916f668ca4607dfa5b28470a8c9d45a85",
-                    "nonce" : "0xdb52f628db720f5b",
-                    "number" : "0x01",
-                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xa28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a007e514d7e366d5122990373be42ff36916f668ca4607dfa5b28470a8c9d45a8588db52f628db720f5bc0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe02c1f40f43ec481ef4f2f5b16c30efa441e1871914eb1c98be8e8539493cbc6",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodeOutput2_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/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json",
-            "sourceHash" : "89ad23b0f07493c27f058d0a5790c37f11c8bcdb3a12b16400544692e83f7efe"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x6233fc5a802449f237cf3d9d14672d92944812aa7ec4940267308649b852d7da",
-                    "mixHash" : "0xa3025180ddd5689c1623806023e29936ff60be2d4fc3e50af951de212e1839a9",
-                    "nonce" : "0x82966cf980415212",
-                    "number" : "0x01",
-                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xa28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0a3025180ddd5689c1623806023e29936ff60be2d4fc3e50af951de212e1839a98882966cf980415212c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6233fc5a802449f237cf3d9d14672d92944812aa7ec4940267308649b852d7da",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodeOutput2_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/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json",
-            "sourceHash" : "89ad23b0f07493c27f058d0a5790c37f11c8bcdb3a12b16400544692e83f7efe"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x4934362cc4feb524a1e63cce8dcac8f476deab59cdfbd11b46e3e3eb56156a98",
-                    "mixHash" : "0xd6071a43c10cf6a4342c8d8b4c5c02357a02e25dcc1c79adda61e0f22376a2cd",
-                    "nonce" : "0x5fef82d250820c83",
-                    "number" : "0x01",
-                    "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xa28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0d6071a43c10cf6a4342c8d8b4c5c02357a02e25dcc1c79adda61e0f22376a2cd885fef82d250820c83c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x16fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4934362cc4feb524a1e63cce8dcac8f476deab59cdfbd11b46e3e3eb56156a98",
-        "network" : "Frontier",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600060006020600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodeOutput2_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput2_d0g0v0Filler.json",
-            "sourceHash" : "89ad23b0f07493c27f058d0a5790c37f11c8bcdb3a12b16400544692e83f7efe"
+            "sourceHash" : "57628bb0d764a3c54b71b62ccb416e8237bb30147af149d254d179a1f266b5f8"
         },
         "blocks" : [
             {
@@ -456,9 +126,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x553e70daab7c833859c81f3a6a754da40ae4ba4102d438adf5abed35b99b32f2",
-                    "mixHash" : "0x9164a27466e7ddf15021a967aaa6cecfac5488c4f9b06f74ef75f97d606d3875",
-                    "nonce" : "0x31b4f4f67af905cf",
+                    "hash" : "0xde339cefd2ed86881e9d22ccd2c24cf6f4daac8682013b72062a58bae56d17f3",
+                    "mixHash" : "0x8f4f099abede2b5a5989c1b080584c9a5adf75d40e0b9b8ec613f32b96fc0aa1",
+                    "nonce" : "0x8d46da8c51df17d5",
                     "number" : "0x01",
                     "parentHash" : "0x12349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5be",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -467,7 +137,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a09164a27466e7ddf15021a967aaa6cecfac5488c4f9b06f74ef75f97d606d38758831b4f4f67af905cfc0c0",
+                "rlp" : "0xf901faf901f5a012349686498e17108a93c82372be2bdad7404dd110cc00e3086389cce822c5bea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a28c19922d71a0304c2d82896cb20c9f8f3016f6d0e4c15c8683a1f0f76b82c2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a08f4f099abede2b5a5989c1b080584c9a5adf75d40e0b9b8ec613f32b96fc0aa1888d46da8c51df17d5c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -493,7 +163,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa016fbf8f44ee0390178f1bb8be896c0e97bf0fa8602476bdbe5f9c3a7c6c2f238a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x553e70daab7c833859c81f3a6a754da40ae4ba4102d438adf5abed35b99b32f2",
+        "lastblockhash" : "0xde339cefd2ed86881e9d22ccd2c24cf6f4daac8682013b72062a58bae56d17f3",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0.json
index 094ffa7fd..fccc6b5e9 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodeOutput3Fail_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json",
-            "sourceHash" : "f3d6013150e5c345cbba1bdc608146e7ebf6b6e979f2b838ea52a3680ba51f2f"
+            "sourceHash" : "0361ce3f7ca7d87bd87a2049d89485e8fb8d3087aec58ef9bd0f9c44efeee296"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x4a28045dc5ed181a9d29aa82a75e0d2e3496d92d26ef34acb096bf555531567f",
-                    "mixHash" : "0x892f46cf39041a49f8200d0d8524b51ebc9cae5ec347fc03a9c2e68641fc48fd",
-                    "nonce" : "0x3e05ccf04bbf6b6e",
+                    "hash" : "0xe68b77ebc82e23e42502dae80f90395f3381255feaa5d3a48f3a165b0eb2c919",
+                    "mixHash" : "0xdee7ad06f57fe1575f296846f12e1c06fdc1d63e28a6593736a47b94ef5a7517",
+                    "nonce" : "0x34f4618315c10292",
                     "number" : "0x01",
                     "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0400c0e06577e302b47f8f843c775be4e4323c6157993597e7a1baa07e51d380aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0892f46cf39041a49f8200d0d8524b51ebc9cae5ec347fc03a9c2e68641fc48fd883e05ccf04bbf6b6ec0c0",
+                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0400c0e06577e302b47f8f843c775be4e4323c6157993597e7a1baa07e51d380aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0dee7ad06f57fe1575f296846f12e1c06fdc1d63e28a6593736a47b94ef5a75178834f4618315c10292c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -53,7 +53,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4a28045dc5ed181a9d29aa82a75e0d2e3496d92d26ef34acb096bf555531567f",
+        "lastblockhash" : "0xe68b77ebc82e23e42502dae80f90395f3381255feaa5d3a48f3a165b0eb2c919",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -109,343 +109,13 @@
             }
         }
     },
-    "callcodeOutput3Fail_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/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json",
-            "sourceHash" : "f3d6013150e5c345cbba1bdc608146e7ebf6b6e979f2b838ea52a3680ba51f2f"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x8ab3a06728a93a78ed74ac6b2d20e3740dd13860cf3ba76648ccdb8019ba759e",
-                    "mixHash" : "0xbb060df1830f09e03578edea6d037af8b03b8485119f3b9fe087cda567340c98",
-                    "nonce" : "0xb306783593aeb5e5",
-                    "number" : "0x01",
-                    "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xb3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0bb060df1830f09e03578edea6d037af8b03b8485119f3b9fe087cda567340c9888b306783593aeb5e5c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x9be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8ae",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8ab3a06728a93a78ed74ac6b2d20e3740dd13860cf3ba76648ccdb8019ba759e",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodeOutput3Fail_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/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json",
-            "sourceHash" : "f3d6013150e5c345cbba1bdc608146e7ebf6b6e979f2b838ea52a3680ba51f2f"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0xe4c2c1ad259237b02895a0c3b7beb10f75c155bca33cfad2c6d93a4bb10722f3",
-                    "mixHash" : "0xca39937cf95b6270e5deae3e3e5fb497685b42bc46dc8d6981a6fb4edb9114f5",
-                    "nonce" : "0x13877bd23e18a32a",
-                    "number" : "0x01",
-                    "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xb3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ca39937cf95b6270e5deae3e3e5fb497685b42bc46dc8d6981a6fb4edb9114f58813877bd23e18a32ac0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x9be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8ae",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe4c2c1ad259237b02895a0c3b7beb10f75c155bca33cfad2c6d93a4bb10722f3",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodeOutput3Fail_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/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json",
-            "sourceHash" : "f3d6013150e5c345cbba1bdc608146e7ebf6b6e979f2b838ea52a3680ba51f2f"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0xdf1a89c184b6ec9544cb4822c5f34490694070026566802c1598ed89fcab07c4",
-                    "mixHash" : "0x1fd3782e2363795ecb7dca4030c11ccf272da120d8d0aa6138c635ee42ff926b",
-                    "nonce" : "0x5c6bf89cc295f618",
-                    "number" : "0x01",
-                    "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xb3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a01fd3782e2363795ecb7dca4030c11ccf272da120d8d0aa6138c635ee42ff926b885c6bf89cc295f618c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x9be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8ae",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdf1a89c184b6ec9544cb4822c5f34490694070026566802c1598ed89fcab07c4",
-        "network" : "Frontier",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b66000526020600060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f250600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodeOutput3Fail_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3Fail_d0g0v0Filler.json",
-            "sourceHash" : "f3d6013150e5c345cbba1bdc608146e7ebf6b6e979f2b838ea52a3680ba51f2f"
+            "sourceHash" : "0361ce3f7ca7d87bd87a2049d89485e8fb8d3087aec58ef9bd0f9c44efeee296"
         },
         "blocks" : [
             {
@@ -456,9 +126,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x67c032cc9f661fc201dfc6099a13d6118467d0763e5ccdfded60e59168882539",
-                    "mixHash" : "0x49806a344c699a0140a5ecde37e6cb893f7559670d07d3d4f6456cfd1d5f7121",
-                    "nonce" : "0x07833a40cbca998b",
+                    "hash" : "0xaaeaa6dc3885a5fd3e56f9efe7b36d0499503f0573263272390a683be16f09fe",
+                    "mixHash" : "0x588ebf2b8b03bfb20d7206f462f2e167a124de4a8f5b6c845cec4465df4089d9",
+                    "nonce" : "0x0b8a6d9c50a7026d",
                     "number" : "0x01",
                     "parentHash" : "0x6a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -467,7 +137,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a049806a344c699a0140a5ecde37e6cb893f7559670d07d3d4f6456cfd1d5f71218807833a40cbca998bc0c0",
+                "rlp" : "0xf901faf901f5a06a2fe43fc7d88b8a3abbeac06a22bf969ee7784aed44e691172ee64eaf69ee06a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3807d0c9c4384a77c4efd734ac57f43eaff924e748e70e2e4f149cb363d0296a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0588ebf2b8b03bfb20d7206f462f2e167a124de4a8f5b6c845cec4465df4089d9880b8a6d9c50a7026dc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -493,7 +163,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09be484174db6f7fbe30c0005277095ca7e1022c3210e064e96bb264700afb8aea056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x67c032cc9f661fc201dfc6099a13d6118467d0763e5ccdfded60e59168882539",
+        "lastblockhash" : "0xaaeaa6dc3885a5fd3e56f9efe7b36d0499503f0573263272390a683be16f09fe",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0.json
index 942f0f4e5..b21d322e7 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodeOutput3_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json",
-            "sourceHash" : "9092bcdf29c07dfd33602d61cabfed94f5d55dd362f4bf3e3f9837d40958884b"
+            "sourceHash" : "0d5074bf1af3134256da03f784f83f9022889ae8c6435415624c7475bddab90e"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x0735b4454c7f3f8c2dc0076da22d2e68c7356cc5deeca75013f340e5140a1aab",
-                    "mixHash" : "0x9277ea03176430b458e778b32e9079e0aa879d2746953b94e431fab8788665d7",
-                    "nonce" : "0xa99ec28bdec902e2",
+                    "hash" : "0x1b385f74e9977b1d6765d339805c62f08350da951227a4ddc7e7f5d29c789a66",
+                    "mixHash" : "0xfc76d965ec7eddd1233058fb95917a54c724c1e5d757405412d4dca2757812a0",
+                    "nonce" : "0x3730cc4d939aa5c2",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05bba6d30b32673f34ab313edbf7dac6389f768ca71dcf5211481a67304a285f3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a09277ea03176430b458e778b32e9079e0aa879d2746953b94e431fab8788665d788a99ec28bdec902e2c0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05bba6d30b32673f34ab313edbf7dac6389f768ca71dcf5211481a67304a285f3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0fc76d965ec7eddd1233058fb95917a54c724c1e5d757405412d4dca2757812a0883730cc4d939aa5c2c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -53,7 +53,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0735b4454c7f3f8c2dc0076da22d2e68c7356cc5deeca75013f340e5140a1aab",
+        "lastblockhash" : "0x1b385f74e9977b1d6765d339805c62f08350da951227a4ddc7e7f5d29c789a66",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -109,343 +109,13 @@
             }
         }
     },
-    "callcodeOutput3_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/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json",
-            "sourceHash" : "9092bcdf29c07dfd33602d61cabfed94f5d55dd362f4bf3e3f9837d40958884b"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0xe8220793d7572bd54afb9c2bf6c0153e5906bc642b50d5cc75382eca57af747f",
-                    "mixHash" : "0xfdf19646087d9659bbf81572a002343dcc54d7e08fd2bfef7dcbfa1761edb52f",
-                    "nonce" : "0x12a110643e3d9f80",
-                    "number" : "0x01",
-                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0fdf19646087d9659bbf81572a002343dcc54d7e08fd2bfef7dcbfa1761edb52f8812a110643e3d9f80c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe8220793d7572bd54afb9c2bf6c0153e5906bc642b50d5cc75382eca57af747f",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodeOutput3_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/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json",
-            "sourceHash" : "9092bcdf29c07dfd33602d61cabfed94f5d55dd362f4bf3e3f9837d40958884b"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0xd768dada2d24b8a8182ecd0be237dafe96a00ac64ba5c39459ef79960a005507",
-                    "mixHash" : "0x810df233d0c5ca17904dcd5333a80a7b91c927324eed28b0e9f0be89a53b555e",
-                    "nonce" : "0x84cea10ae49bdb0a",
-                    "number" : "0x01",
-                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0810df233d0c5ca17904dcd5333a80a7b91c927324eed28b0e9f0be89a53b555e8884cea10ae49bdb0ac0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd768dada2d24b8a8182ecd0be237dafe96a00ac64ba5c39459ef79960a005507",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodeOutput3_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/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json",
-            "sourceHash" : "9092bcdf29c07dfd33602d61cabfed94f5d55dd362f4bf3e3f9837d40958884b"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0xc6cbdd0d5a8c221ac3bfb127d2bd8d4b57661e85938257a851523efb5a6913fa",
-                    "mixHash" : "0x2c792d7f049a5f049809c79a9fc186435e7eee7a08c2ca49898448c2f658af06",
-                    "nonce" : "0xd267bcb12a39356a",
-                    "number" : "0x01",
-                    "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02c792d7f049a5f049809c79a9fc186435e7eee7a08c2ca49898448c2f658af0688d267bcb12a39356ac0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xb3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc6cbdd0d5a8c221ac3bfb127d2bd8d4b57661e85938257a851523efb5a6913fa",
-        "network" : "Frontier",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052602060006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodeOutput3_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3_d0g0v0Filler.json",
-            "sourceHash" : "9092bcdf29c07dfd33602d61cabfed94f5d55dd362f4bf3e3f9837d40958884b"
+            "sourceHash" : "0d5074bf1af3134256da03f784f83f9022889ae8c6435415624c7475bddab90e"
         },
         "blocks" : [
             {
@@ -456,9 +126,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x8d3a2229ef1b491bcc567d578b576c317d0f66614c84bcebb5a6cdcb3df70fd2",
-                    "mixHash" : "0xecbd6afbf24e1d5261a71236d38bfbf9fa4a9339180d69c2d2484f1ce75d4877",
-                    "nonce" : "0x9b1d1bb995a076e2",
+                    "hash" : "0x133f12fd2da88460dc9218190f3b5ea5bb37db8bd2614ed1e00a3c1a404e20de",
+                    "mixHash" : "0xea7dac5942b231d746af1743354e47c99ee183c073a5a62b25b067f3c1aaab09",
+                    "nonce" : "0x730b87f8ba3555ba",
                     "number" : "0x01",
                     "parentHash" : "0xcd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -467,7 +137,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ecbd6afbf24e1d5261a71236d38bfbf9fa4a9339180d69c2d2484f1ce75d4877889b1d1bb995a076e2c0c0",
+                "rlp" : "0xf901faf901f5a0cd27d4dd9b363c084354c8d55fa2b1d1e34f3284c01108a5844ace13fdc81604a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac2a052a330c0a508c9dff032f630f055b51ff761169cd957b8aa697353c0110a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ea7dac5942b231d746af1743354e47c99ee183c073a5a62b25b067f3c1aaab0988730b87f8ba3555bac0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -493,7 +163,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3e4e1251821dfe4c6d52f8b9540b67f7f13c1d20269acae261c5defe3d67a9aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8d3a2229ef1b491bcc567d578b576c317d0f66614c84bcebb5a6cdcb3df70fd2",
+        "lastblockhash" : "0x133f12fd2da88460dc9218190f3b5ea5bb37db8bd2614ed1e00a3c1a404e20de",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0.json
index 17d99df48..4400175ef 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodeOutput3partialFail_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json",
-            "sourceHash" : "daa1654c358acadd88e674cedcd0a473cfbd8c760767f0f1de629229f85761de"
+            "sourceHash" : "9a8917dae8abbfe8e65c9a4f1870cd79a842dde5319f5cc55b58bd67265598d3"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x8cb3896d5768cd9892b725fb1b4ff028ccd0e518927bc15274789fec33732330",
-                    "mixHash" : "0x2ffbea340b5a90e2d9a6446e052ec11cee4cdba6534dbea2b566e5efce636961",
-                    "nonce" : "0xbcd7b1dc154be0fe",
+                    "hash" : "0xa70500b2f2f69768fd972880c90c66fc402e898e82743a4a49bc4991d5778d82",
+                    "mixHash" : "0x722d2c09c56d5cae6a29d6f5f10159f186ad2883a2acae6a8b2c51ca8eaa33e6",
+                    "nonce" : "0x7d5e60be5a44daf6",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2afc10b3e8a4b848c9c78a970a4eaf6c691b3091d2976ac8ac71a34783637e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02ffbea340b5a90e2d9a6446e052ec11cee4cdba6534dbea2b566e5efce63696188bcd7b1dc154be0fec0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e2afc10b3e8a4b848c9c78a970a4eaf6c691b3091d2976ac8ac71a34783637e3a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0722d2c09c56d5cae6a29d6f5f10159f186ad2883a2acae6a8b2c51ca8eaa33e6887d5e60be5a44daf6c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -53,7 +53,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8cb3896d5768cd9892b725fb1b4ff028ccd0e518927bc15274789fec33732330",
+        "lastblockhash" : "0xa70500b2f2f69768fd972880c90c66fc402e898e82743a4a49bc4991d5778d82",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -109,343 +109,13 @@
             }
         }
     },
-    "callcodeOutput3partialFail_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/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json",
-            "sourceHash" : "daa1654c358acadd88e674cedcd0a473cfbd8c760767f0f1de629229f85761de"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x9d3e2eba4a21d4fae4014eb8474271ea47b97256e617232ec4b44f9e1e853df3",
-                    "mixHash" : "0xb4556b79758d07afcc01ee9ba89a8922ef94e768b25c6ca9254982f097cfef8b",
-                    "nonce" : "0x9149a98ccf41e9e0",
-                    "number" : "0x01",
-                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0b4556b79758d07afcc01ee9ba89a8922ef94e768b25c6ca9254982f097cfef8b889149a98ccf41e9e0c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9d3e2eba4a21d4fae4014eb8474271ea47b97256e617232ec4b44f9e1e853df3",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodeOutput3partialFail_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/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json",
-            "sourceHash" : "daa1654c358acadd88e674cedcd0a473cfbd8c760767f0f1de629229f85761de"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x022dd503cbf13b308e02f07a65db97ab0e638a25fb0b4eb34fc507a4469393f1",
-                    "mixHash" : "0x56e3a26bbaeb168fac6bf0b2d02a5cafc130d51e5609c00e267907d3fc8c5e2e",
-                    "nonce" : "0xa0267ba5c931d022",
-                    "number" : "0x01",
-                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a056e3a26bbaeb168fac6bf0b2d02a5cafc130d51e5609c00e267907d3fc8c5e2e88a0267ba5c931d022c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x022dd503cbf13b308e02f07a65db97ab0e638a25fb0b4eb34fc507a4469393f1",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodeOutput3partialFail_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/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json",
-            "sourceHash" : "daa1654c358acadd88e674cedcd0a473cfbd8c760767f0f1de629229f85761de"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0xb7cfb41cff3ca6d1ae32d3877c79a03b3a15fd9fd96ab4cfc1c33134abb67777",
-                    "mixHash" : "0x141e5f06b8f7de26ace85a02aa1a16804cd0c6de63fad7948af553c4adea9144",
-                    "nonce" : "0x33aafa5bff3b9ff3",
-                    "number" : "0x01",
-                    "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0x01f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9df",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0141e5f06b8f7de26ace85a02aa1a16804cd0c6de63fad7948af553c4adea91448833aafa5bff3b9ff3c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xc02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb7cfb41cff3ca6d1ae32d3877c79a03b3a15fd9fd96ab4cfc1c33134abb67777",
-        "network" : "Frontier",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x016001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodeOutput3partialFail_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partialFail_d0g0v0Filler.json",
-            "sourceHash" : "daa1654c358acadd88e674cedcd0a473cfbd8c760767f0f1de629229f85761de"
+            "sourceHash" : "9a8917dae8abbfe8e65c9a4f1870cd79a842dde5319f5cc55b58bd67265598d3"
         },
         "blocks" : [
             {
@@ -456,9 +126,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0xa32267d62f59bbc6cab41ff3886adb458b133bb70efae19abdcecc773830b38f",
-                    "mixHash" : "0x73876a7455543c9cbaba006e36dd95ffb35b9fdb49f8b86020d713e9ece7d66d",
-                    "nonce" : "0x07fcb247f5e4fb8b",
+                    "hash" : "0xde333e7ce41d71455644c57f0bf9d52893fa5bf33826134c098e2bd313ed8ea5",
+                    "mixHash" : "0xe93df561e1b23c229ada785b3d60a20a227736cb233ef39114ccfc1e8d3a2ad3",
+                    "nonce" : "0x1ddd2673655caab7",
                     "number" : "0x01",
                     "parentHash" : "0x8a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -467,7 +137,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a073876a7455543c9cbaba006e36dd95ffb35b9fdb49f8b86020d713e9ece7d66d8807fcb247f5e4fb8bc0c0",
+                "rlp" : "0xf901faf901f5a08a2b03034de510dfa237c7742088f5c07ddf4ded38a7f54f49e62cf780400f59a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa001f228c49cc676a59bdf6cdcbd5a260308752ab6b6527d06cf8b3844c9c6d9dfa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0e93df561e1b23c229ada785b3d60a20a227736cb233ef39114ccfc1e8d3a2ad3881ddd2673655caab7c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -493,7 +163,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c02b6bdc3bd48cd6a29272b00bfc73a63aeba61bb3096360c716987ee9e8cb19a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa32267d62f59bbc6cab41ff3886adb458b133bb70efae19abdcecc773830b38f",
+        "lastblockhash" : "0xde333e7ce41d71455644c57f0bf9d52893fa5bf33826134c098e2bd313ed8ea5",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0.json
index 7c7b35e36..2a5f89a9a 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodeOutput3partial_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json",
-            "sourceHash" : "119b45f1fad253844b50a617478b17a308eca2bfecc6736331c995727f6c29b7"
+            "sourceHash" : "1be83566e9a6508762d0f85f0b2b8acf751555e3477acb4cc1047c62de8979ea"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x9bd6ac1cddcfdfa1fe762f5765fda0e14a3039fa64b63245b1317e61a3149961",
-                    "mixHash" : "0x9b3089974d187974a8cc5be01737fd65e1e4fe779ac50d593d6bf4d610948667",
-                    "nonce" : "0x62eb11a25ed65c3b",
+                    "hash" : "0xdfcabc7b02c32b48363149c246974bb32e8c1a9ee723044e3762ed0619bfda2e",
+                    "mixHash" : "0xca54f059ed564d53dc127cdc3ec9585bd29d6182966ebac68bcea98e969775d6",
+                    "nonce" : "0x1b880ce91a047dc9",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -27,7 +27,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01af36e1ffb0080e322d10ee6072a6dfc353a93a1d39c925b39171632b2bd7841a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a09b3089974d187974a8cc5be01737fd65e1e4fe779ac50d593d6bf4d6109486678862eb11a25ed65c3bc0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01af36e1ffb0080e322d10ee6072a6dfc353a93a1d39c925b39171632b2bd7841a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ca54f059ed564d53dc127cdc3ec9585bd29d6182966ebac68bcea98e969775d6881b880ce91a047dc9c0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -53,7 +53,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9bd6ac1cddcfdfa1fe762f5765fda0e14a3039fa64b63245b1317e61a3149961",
+        "lastblockhash" : "0xdfcabc7b02c32b48363149c246974bb32e8c1a9ee723044e3762ed0619bfda2e",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -109,343 +109,13 @@
             }
         }
     },
-    "callcodeOutput3partial_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/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json",
-            "sourceHash" : "119b45f1fad253844b50a617478b17a308eca2bfecc6736331c995727f6c29b7"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x0b83d9237147466e92e8bf9d547ddafd770e38b69e7b699e6362496ac3c745e1",
-                    "mixHash" : "0x5b5e8a83bebf4a448d60932fc439c1243431681ac6582d3afd0a00fb7230df96",
-                    "nonce" : "0x0182d96a533bf820",
-                    "number" : "0x01",
-                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xabb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a05b5e8a83bebf4a448d60932fc439c1243431681ac6582d3afd0a00fb7230df96880182d96a533bf820c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0b83d9237147466e92e8bf9d547ddafd770e38b69e7b699e6362496ac3c745e1",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodeOutput3partial_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/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json",
-            "sourceHash" : "119b45f1fad253844b50a617478b17a308eca2bfecc6736331c995727f6c29b7"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x5db2925f45e60eff7b8b4cecd3d72611da63e622a0db350118ea783980baac29",
-                    "mixHash" : "0xecfba6c9c6141bfe01f5c05c79c09b53572f4e9d8e10c3b063a5d57a03de6e5b",
-                    "nonce" : "0x9b71dccafbcb0b04",
-                    "number" : "0x01",
-                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xabb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a0ecfba6c9c6141bfe01f5c05c79c09b53572f4e9d8e10c3b063a5d57a03de6e5b889b71dccafbcb0b04c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5db2925f45e60eff7b8b4cecd3d72611da63e622a0db350118ea783980baac29",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodeOutput3partial_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/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json",
-            "sourceHash" : "119b45f1fad253844b50a617478b17a308eca2bfecc6736331c995727f6c29b7"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x00",
-                    "hash" : "0x3db663d1604572a7e495de0ef9e93c32053af0ce0da0a60582d14896741e47c8",
-                    "mixHash" : "0x2b8ba5d698be2594031a0ad1d92546aae9245c706123439f9e1b5a617da7d10a",
-                    "nonce" : "0x15d506020543b764",
-                    "number" : "0x01",
-                    "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-                    "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "stateRoot" : "0xabb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a02b8ba5d698be2594031a0ad1d92546aae9245c706123439f9e1b5a617da7d10a8815d506020543b764c0c0",
-                "transactions" : [
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xa36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3db663d1604572a7e495de0ef9e93c32053af0ce0da0a60582d14896741e47c8",
-        "network" : "Frontier",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f40000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7f5e20a0453cecd065ea59c37ac63e079ee08998b6045136a8ce6635c7912ec0b6600052600a60006000600073aaae7baea6a6c7c4c2dfeb977efac326af552d8761c350f450600051600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xaaae7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x6001600101600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodeOutput3partial_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callcodeOutput3partial_d0g0v0Filler.json",
-            "sourceHash" : "119b45f1fad253844b50a617478b17a308eca2bfecc6736331c995727f6c29b7"
+            "sourceHash" : "1be83566e9a6508762d0f85f0b2b8acf751555e3477acb4cc1047c62de8979ea"
         },
         "blocks" : [
             {
@@ -456,9 +126,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x00",
-                    "hash" : "0x3e8a9096532fc4bca4752bd609ca7f93a49e123a02553137ccdc8316aad70f81",
-                    "mixHash" : "0x88cb7edf2faa22ca5dc19dfb27ab71c60dcc0915753449ef3d1cbd4ca60ae2f7",
-                    "nonce" : "0xf9cd6dccb95b3241",
+                    "hash" : "0xa73d193f441cc093c57a61cad41b914b042e1a79293b8b67fa03b678f5d76d35",
+                    "mixHash" : "0x27538eefb83a4db4fbf64992429b248dedb6c0ed64536fea518fd385d2049d7a",
+                    "nonce" : "0x94138981f289956f",
                     "number" : "0x01",
                     "parentHash" : "0x94748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474",
                     "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
@@ -467,7 +137,7 @@
                     "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a088cb7edf2faa22ca5dc19dfb27ab71c60dcc0915753449ef3d1cbd4ca60ae2f788f9cd6dccb95b3241c0c0",
+                "rlp" : "0xf901faf901f5a094748214aea3b3db7b3c9c7efba7d4fa224a8841e0cdf2b806604b3edd70a474a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0abb3c7945c626ddc83f2979e5dbc29c7a3585c352bfeefe25707540e2b60d108a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240808203e880a027538eefb83a4db4fbf64992429b248dedb6c0ed64536fea518fd385d2049d7a8894138981f289956fc0c0",
                 "transactions" : [
                 ],
                 "uncleHeaders" : [
@@ -493,7 +163,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a36015c22035bf31a50b980e8419e4ca9618d3a923f1f279b4463154ce950a78a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3e8a9096532fc4bca4752bd609ca7f93a49e123a02553137ccdc8316aad70f81",
+        "lastblockhash" : "0xa73d193f441cc093c57a61cad41b914b042e1a79293b8b67fa03b678f5d76d35",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0.json
index 746973a53..5f7b1e447 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0.json
@@ -2,10 +2,10 @@
     "callcodeWithHighValueAndGasOOG_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "51a5fd6f22be6e375d9eb7d2f3f27195838eb05ae43f3771f27a711f94abf4df"
+            "sourceHash" : "08386eaa15330b4c0f722151c6209eee80a3633ac7dd79e3e6e99f6db9cb1bbf"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf149",
-                    "hash" : "0x62e65ad01ead09019bf88d898287a23944775444c74945e842965330ec49deaf",
-                    "mixHash" : "0x5ba68e6faef8b4327bc14973f90fdfd7ff8de7b2eeb4d506a6b9d2345f013212",
-                    "nonce" : "0x661373598621c264",
+                    "hash" : "0x5e7dcbd043667bb0aaf75171fdae3339f05bcbf0e6b3318e9127b1ac105e137d",
+                    "mixHash" : "0x40620eb42d39a528a9423ac5e60fe99e95f78ab322a6d12c6b4c5224f91dcb4e",
+                    "nonce" : "0x6b1ea5cca9466937",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0x963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ea77f52a4e76756cdd0d5ddec2aa2c2e96fc172b42a3ffa3a650f5ffd756635a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a05ba68e6faef8b4327bc14973f90fdfd7ff8de7b2eeb4d506a6b9d2345f01321288661373598621c264f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07ea77f52a4e76756cdd0d5ddec2aa2c2e96fc172b42a3ffa3a650f5ffd756635a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0963c5033248964b8b7eaf856950dff14f290ef8d1c62c2a21954b9cb35837a88b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a040620eb42d39a528a9423ac5e60fe99e95f78ab322a6d12c6b4c5224f91dcb4e886b1ea5cca9466937f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x62e65ad01ead09019bf88d898287a23944775444c74945e842965330ec49deaf",
+        "lastblockhash" : "0x5e7dcbd043667bb0aaf75171fdae3339f05bcbf0e6b3318e9127b1ac105e137d",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -122,259 +122,13 @@
             }
         }
     },
-    "callcodeWithHighValueAndGasOOG_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/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "51a5fd6f22be6e375d9eb7d2f3f27195838eb05ae43f3771f27a711f94abf4df"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf149",
-                    "hash" : "0xe09257371ad7bb80b4de6309338f9dae3810eb579877b554ddc9bd3737d38f3f",
-                    "mixHash" : "0x99a115f4a258e54944390b57b45aeb3d72892f7a5da999b2448170c8e39f76b1",
-                    "nonce" : "0x2ccadf3bd237176f",
-                    "number" : "0x01",
-                    "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-                    "receiptTrie" : "0xe436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067",
-                    "stateRoot" : "0x12711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a099a115f4a258e54944390b57b45aeb3d72892f7a5da999b2448170c8e39f76b1882ccadf3bd237176ff865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x8096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22e",
-                        "s" : "0x167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6d",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x4bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe09257371ad7bb80b4de6309338f9dae3810eb579877b554ddc9bd3737d38f3f",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f149",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618817",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "callcodeWithHighValueAndGasOOG_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/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "51a5fd6f22be6e375d9eb7d2f3f27195838eb05ae43f3771f27a711f94abf4df"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf149",
-                    "hash" : "0x6d50edb5c9accaaff65aba1c1c8041657338deb2604f2f5cb4ee45aaeffdbcff",
-                    "mixHash" : "0x7eebe784147f49603bfb38c32bfb2a042e17cca20604ff894a448b2077d9d317",
-                    "nonce" : "0x4eade0c6e6b60175",
-                    "number" : "0x01",
-                    "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-                    "receiptTrie" : "0xe436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067",
-                    "stateRoot" : "0x12711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90263f901f8a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa012711bc75f0e336dd1e7c38cd0eda1835f03d8756945f29767fcffa8043e59a9a0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da0e436f7eb91f085d1faa50bd9b61be19efbbc2fbffbce1e477782dd4ef6259067b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1498203e880a07eebe784147f49603bfb38c32bfb2a042e17cca20604ff894a448b2077d9d317884eade0c6e6b60175f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x8096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22e",
-                        "s" : "0x167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6d",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x0186a0"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x4bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6d50edb5c9accaaff65aba1c1c8041657338deb2604f2f5cb4ee45aaeffdbcff",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a76586a0",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f149",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7618817",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x7fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff6000527faaffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffaa602052600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56bfffffffffffffffffffffffff4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "callcodeWithHighValueAndGasOOG_d0g0v0_Frontier" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "51a5fd6f22be6e375d9eb7d2f3f27195838eb05ae43f3771f27a711f94abf4df"
+            "sourceHash" : "08386eaa15330b4c0f722151c6209eee80a3633ac7dd79e3e6e99f6db9cb1bbf"
         },
         "blocks" : [
             {
@@ -385,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0xc121456d49115d2a6fe85826241c16f0ea7f85736cd3b2635e938806c47d22c4",
-                    "mixHash" : "0x673eb2dcc97377174af7d65abaea0563ffe695b19b3c475871d0ad5617106826",
-                    "nonce" : "0x57de80d5d4b576c8",
+                    "hash" : "0xc5a23ee639dd012c2162f5068d6f835678b96125e0c80f91fab496dda95e1338",
+                    "mixHash" : "0xf77fe169d4383f2471c6bc28a916252ffe25f14d717e7f63a4493cf357799711",
+                    "nonce" : "0x1d713f751898018a",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0x08ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7",
@@ -396,10 +150,10 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0673eb2dcc97377174af7d65abaea0563ffe695b19b3c475871d0ad56171068268857de80d5d4b576c8f865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0f77fe169d4383f2471c6bc28a916252ffe25f14d717e7f63a4493cf357799711881d713f751898018af865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -433,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc121456d49115d2a6fe85826241c16f0ea7f85736cd3b2635e938806c47d22c4",
+        "lastblockhash" : "0xc5a23ee639dd012c2162f5068d6f835678b96125e0c80f91fab496dda95e1338",
         "network" : "Frontier",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -492,10 +246,10 @@
     "callcodeWithHighValueAndGasOOG_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/callcodeWithHighValueAndGasOOG_d0g0v0Filler.json",
-            "sourceHash" : "51a5fd6f22be6e375d9eb7d2f3f27195838eb05ae43f3771f27a711f94abf4df"
+            "sourceHash" : "08386eaa15330b4c0f722151c6209eee80a3633ac7dd79e3e6e99f6db9cb1bbf"
         },
         "blocks" : [
             {
@@ -506,9 +260,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x0e18d2a887e3dc11f89c903e881843060192695713e45da44eefbc07b40d1360",
-                    "mixHash" : "0xc9fcfd4d52a17ab001c7fc8fac8d477862ee82e947c61773857c0dc639cd1a40",
-                    "nonce" : "0x0c54dad82246976c",
+                    "hash" : "0xa112928aca79e314b23fca87ad08860dbcdc5d09e899fd4c6e7bc5526d48daf0",
+                    "mixHash" : "0xbff3308933d6cc84feb19b1871ddc19435feb67bdf48ea990c45b734f78e62fa",
+                    "nonce" : "0x9af290cda9faca3a",
                     "number" : "0x01",
                     "parentHash" : "0x108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204",
                     "receiptTrie" : "0x08ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7",
@@ -517,10 +271,10 @@
                     "transactionsTrie" : "0xb827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223d",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0c9fcfd4d52a17ab001c7fc8fac8d477862ee82e947c61773857c0dc639cd1a40880c54dad82246976cf865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
+                "rlp" : "0xf90264f901f9a0108dd2dc34b7451d37f2f40e46d3b30313a45343d24ceab2520efe6f3c128204a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0de336eac7ad21e07b36801616217d090a4194f0462bf306b8fe93ddf5d73553ca0b827084851c7c9f0a22218dbb1d4d88c871fd43e04e7f4b3c4420987858a223da008ad2ce7a21876007c8d560357cb330720b8a579ba7e3b9c6e5091b2fcc779d7b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0bff3308933d6cc84feb19b1871ddc19435feb67bdf48ea990c45b734f78e62fa889af290cda9faca3af865f8638001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d87830186a0801ba08096c3471a9f83dc8ee939d2caee4b5b2a2c4695c1702c4d9a18345135e0c22ea0167adca0c0e8b378bb21f8c8ab5ff5e3eb63e3ded26009211d4c4ebae5cd9c6dc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -554,7 +308,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04bd4a964a2f81d1b5abdf3649be9897d175e5f0429bd622c1bf51c41b6404268a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0e18d2a887e3dc11f89c903e881843060192695713e45da44eefbc07b40d1360",
+        "lastblockhash" : "0xa112928aca79e314b23fca87ad08860dbcdc5d09e899fd4c6e7bc5526d48daf0",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0.json
index 6b4bae707..91014ef5f 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0.json
@@ -2,10 +2,10 @@
     "deleagateCallAfterValueTransfer_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json",
-            "sourceHash" : "c790ef193dfc79a24882744dc6c1a88a268234a893e15042ce5281083576a43a"
+            "sourceHash" : "b42cd416758869c4a85ad5ed1ee5e52426b633db3a654db2fecb54decf754ba2"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0104c0",
-                    "hash" : "0x6211ada62171d1ced7620ca87fc67085e52c44ea9f0edfb1d6c9f9cc502e3d0e",
-                    "mixHash" : "0x6a51f8e72b5c245c348f755509f857066225353ca380228b09a9157ecc58664b",
-                    "nonce" : "0x9baf2c7144603ccc",
+                    "hash" : "0x1fff99714649c5851ea5cbd576dc1f6f4a51732a91528c14536073f37c990740",
+                    "mixHash" : "0xd351e2e9aded428f69dc3a875f8429beb7d90867d0b8e47a6184cf426ea07cc3",
+                    "nonce" : "0x488061fd8827f40c",
                     "number" : "0x01",
                     "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
                     "receiptTrie" : "0x656e4b60fbeeb7b68b928dd4383be36c74c3d5506f4235124fd0c7c3ec8798c7",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b299540b7c4dadaa2ca384533aa20b49acb91f2c4360feb6bd50880c0fc6bd1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0656e4b60fbeeb7b68b928dd4383be36c74c3d5506f4235124fd0c7c3ec8798c7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a06a51f8e72b5c245c348f755509f857066225353ca380228b09a9157ecc58664b889baf2c7144603cccf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02b299540b7c4dadaa2ca384533aa20b49acb91f2c4360feb6bd50880c0fc6bd1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0656e4b60fbeeb7b68b928dd4383be36c74c3d5506f4235124fd0c7c3ec8798c7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a0d351e2e9aded428f69dc3a875f8429beb7d90867d0b8e47a6184cf426ea07cc388488061fd8827f40cf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6211ada62171d1ced7620ca87fc67085e52c44ea9f0edfb1d6c9f9cc502e3d0e",
+        "lastblockhash" : "0x1fff99714649c5851ea5cbd576dc1f6f4a51732a91528c14536073f37c990740",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -122,380 +122,13 @@
             }
         }
     },
-    "deleagateCallAfterValueTransfer_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/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json",
-            "sourceHash" : "c790ef193dfc79a24882744dc6c1a88a268234a893e15042ce5281083576a43a"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0104c0",
-                    "hash" : "0x73cd3240000b7b3c65cdfeb0eaba50bb15619abb8943eb03aaaa7d7eaa2312cd",
-                    "mixHash" : "0x54fa4eb51abd28f5963d7770fa8389183797454baf5f2fec62d804f875f74dff",
-                    "nonce" : "0x34926cb6d48cf97c",
-                    "number" : "0x01",
-                    "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
-                    "receiptTrie" : "0x3509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947c",
-                    "stateRoot" : "0xe7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a03509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a054fa4eb51abd28f5963d7770fa8389183797454baf5f2fec62d804f875f74dff8834926cb6d48cf97cf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x06e9d9",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
-                        "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x29cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x73cd3240000b7b3c65cdfeb0eaba50bb15619abb8943eb03aaaa7d7eaa2312cd",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x10c8e0",
-                "code" : "0x60016000526040600060406000731000000000000000000000000000000000000001620186a0f4",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x01" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x02" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x3460005533600155600035600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f504c0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbffb40",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x10c8e0",
-                "code" : "0x60016000526040600060406000731000000000000000000000000000000000000001620186a0f4",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x3460005533600155600035600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fc10000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "deleagateCallAfterValueTransfer_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/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json",
-            "sourceHash" : "c790ef193dfc79a24882744dc6c1a88a268234a893e15042ce5281083576a43a"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x0104c0",
-                    "hash" : "0x4564435cc745659d1e4ebe5569755a10fa33dd1b56ac24dbfe82044da2703baf",
-                    "mixHash" : "0x6cf7fdf000c8dbd335f974ffd0607bd06afdb7042dfcf868df894842763bee14",
-                    "nonce" : "0x2c7ccf445644e532",
-                    "number" : "0x01",
-                    "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
-                    "receiptTrie" : "0x3509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947c",
-                    "stateRoot" : "0xe7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e7d33dece811e46e889e298ba8afbd0b8c10c7d3b5cc5e0cc0f9c9a918958761a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a03509e453da1643345b40e641bf3e56aa86b0c676ba7584fa0b21eabe488c947cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830104c08203e880a06cf7fdf000c8dbd335f974ffd0607bd06afdb7042dfcf868df894842763bee14882c7ccf445644e532f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x06e9d9",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
-                        "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x29cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x4564435cc745659d1e4ebe5569755a10fa33dd1b56ac24dbfe82044da2703baf",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x10c8e0",
-                "code" : "0x60016000526040600060406000731000000000000000000000000000000000000001620186a0f4",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x01" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b",
-                    "0x02" : "0x01"
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x3460005533600155600035600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f504c0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbffb40",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x10c8e0",
-                "code" : "0x60016000526040600060406000731000000000000000000000000000000000000001620186a0f4",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x3460005533600155600035600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fc10000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "deleagateCallAfterValueTransfer_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/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json",
-            "sourceHash" : "c790ef193dfc79a24882744dc6c1a88a268234a893e15042ce5281083576a43a"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x06e9d9",
-                    "hash" : "0x16c16223456af1c80371b608a25b3045ceb58186ce5acceb665f780ef3934d76",
-                    "mixHash" : "0x8b77f264fe16cd0efc635b41b7af154a5c274a361aae26c2d9f61027e2b6e718",
-                    "nonce" : "0xff0f264f0daedb4c",
-                    "number" : "0x01",
-                    "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
-                    "receiptTrie" : "0xf9183a4e8588a89354ff85efad40a25d095f0b248436938e6a5ec1f5c4d90156",
-                    "stateRoot" : "0x9dbc514e55a398a56bfd43d63f3657ceaff0743e2a9d7f1f1a20324a637e0ef1",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa09dbc514e55a398a56bfd43d63f3657ceaff0743e2a9d7f1f1a20324a637e0ef1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0f9183a4e8588a89354ff85efad40a25d095f0b248436938e6a5ec1f5c4d90156b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a08b77f264fe16cd0efc635b41b7af154a5c274a361aae26c2d9f61027e2b6e71888ff0f264f0daedb4cf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x06e9d9",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
-                        "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x29cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220a",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x16c16223456af1c80371b608a25b3045ceb58186ce5acceb665f780ef3934d76",
-        "network" : "Frontier",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x10c8e0",
-                "code" : "0x60016000526040600060406000731000000000000000000000000000000000000001620186a0f4",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x3460005533600155600035600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fae9d9",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fba1627",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x10c8e0",
-                "code" : "0x60016000526040600060406000731000000000000000000000000000000000000001620186a0f4",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x00",
-                "code" : "0x3460005533600155600035600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fc10000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "deleagateCallAfterValueTransfer_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/deleagateCallAfterValueTransfer_d0g0v0Filler.json",
-            "sourceHash" : "c790ef193dfc79a24882744dc6c1a88a268234a893e15042ce5281083576a43a"
+            "sourceHash" : "b42cd416758869c4a85ad5ed1ee5e52426b633db3a654db2fecb54decf754ba2"
         },
         "blocks" : [
             {
@@ -506,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01022c",
-                    "hash" : "0xb66b6bbb5fe18fed6a4f36adacbafe39a2733b41ace20e038923cc7ccd3f19b4",
-                    "mixHash" : "0xf0e24f6d2f93154858a2526c0cfd25e0bce449de7156af22d91ff9b06b85ab0a",
-                    "nonce" : "0x2749112fd4bdd263",
+                    "hash" : "0xb5eb16f6bee8f753cf6aacdc61d06b43b19d294c5313a8bcec088e9f79970b82",
+                    "mixHash" : "0x7dbd33277432d9452fb2ec3bf012033c0bbef07a36ae17e3c5a4d017ef64f89f",
+                    "nonce" : "0x6a6b2d84ed419a80",
                     "number" : "0x01",
                     "parentHash" : "0x4c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fb",
                     "receiptTrie" : "0xb39fe4870d771cbfa3593996dc7391df9f352a8a43a5117e61d1f719c7be3e60",
@@ -517,10 +150,10 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05d3c91f78f93d0be75765d10345387cd501fd8faf246d0f7a2b800d11dea0ac1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0b39fe4870d771cbfa3593996dc7391df9f352a8a43a5117e61d1f719c7be3e60b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301022c8203e880a0f0e24f6d2f93154858a2526c0cfd25e0bce449de7156af22d91ff9b06b85ab0a882749112fd4bdd263f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a04c1f25211358ecd99837696adee8ab699342494bf6c2aa3b44f3666bd16904fba01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05d3c91f78f93d0be75765d10345387cd501fd8faf246d0f7a2b800d11dea0ac1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0b39fe4870d771cbfa3593996dc7391df9f352a8a43a5117e61d1f719c7be3e60b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301022c8203e880a07dbd33277432d9452fb2ec3bf012033c0bbef07a36ae17e3c5a4d017ef64f89f886a6b2d84ed419a80f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -554,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa029cc72b9ba7577ddd0ae414e612e5a783b40042bf0b4fa195bf05f77d3f7220aa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb66b6bbb5fe18fed6a4f36adacbafe39a2733b41ace20e038923cc7ccd3f19b4",
+        "lastblockhash" : "0xb5eb16f6bee8f753cf6aacdc61d06b43b19d294c5313a8bcec088e9f79970b82",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0.json
index f928c7cdd..3eeec7b46 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0.json
@@ -2,10 +2,10 @@
     "delegatecallAndOOGatTxLevel_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json",
-            "sourceHash" : "17fae359b25224607e8233a537336d2948be5d06a740d9da2b0e47abcf90d5d6"
+            "sourceHash" : "1d1a2a98577230fd54652e8159c28e97c69af4bea66466949f538c618bd9480e"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf131",
-                    "hash" : "0x01cba681bb1925769c3655a73ae61fd4e99c2a16d9b4b089872693f3127a899d",
-                    "mixHash" : "0x4851b36e8d16b7ef3d6ba39fcf1033d3f7a388682ecbf0bb8bde2683d6dd8a94",
-                    "nonce" : "0x476413db6b719934",
+                    "hash" : "0xea03c10bda55ce296915c39c2d9b055537744b544d2c100c54757629b66ea552",
+                    "mixHash" : "0x5a551191faad66396845c6adffb2236f980b88467b297404542d68e8f66b7ef6",
+                    "nonce" : "0x1a5fdb91d9c7a484",
                     "number" : "0x01",
                     "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
                     "receiptTrie" : "0x06f0ac65277405a55e6663b43732fe014070e3f3ee9a03e7ebf8ca93b7729fd9",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0596e3cc8927f08d3a467374415b5b407d89ab7d0cbd5c3329880de0667e0a169a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a006f0ac65277405a55e6663b43732fe014070e3f3ee9a03e7ebf8ca93b7729fd9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a04851b36e8d16b7ef3d6ba39fcf1033d3f7a388682ecbf0bb8bde2683d6dd8a9488476413db6b719934f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0596e3cc8927f08d3a467374415b5b407d89ab7d0cbd5c3329880de0667e0a169a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a006f0ac65277405a55e6663b43732fe014070e3f3ee9a03e7ebf8ca93b7729fd9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a05a551191faad66396845c6adffb2236f980b88467b297404542d68e8f66b7ef6881a5fdb91d9c7a484f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x01cba681bb1925769c3655a73ae61fd4e99c2a16d9b4b089872693f3127a899d",
+        "lastblockhash" : "0xea03c10bda55ce296915c39c2d9b055537744b544d2c100c54757629b66ea552",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -125,10 +125,10 @@
     "delegatecallAndOOGatTxLevel_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json",
-            "sourceHash" : "17fae359b25224607e8233a537336d2948be5d06a740d9da2b0e47abcf90d5d6"
+            "sourceHash" : "1d1a2a98577230fd54652e8159c28e97c69af4bea66466949f538c618bd9480e"
         },
         "blocks" : [
             {
@@ -139,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf131",
-                    "hash" : "0x82359276c055dc42e8816c51b0710fdf77dadbc6213af73e4c56b9252f79c503",
-                    "mixHash" : "0x3128eed4ff8d8fb20a28c766542607b68e9b28e8751b322c0dfef5db3aea3604",
-                    "nonce" : "0x6501030fa4a9b7fe",
+                    "hash" : "0x619675e9eabe8d000f9a7ce2195f481a478dd9dab87d29819040ca6cca066f8f",
+                    "mixHash" : "0x19f9aa23831fe1413327836b157abd5427dcb63cc8eb96d2378acc7ea114c8e2",
+                    "nonce" : "0x4e19351af69e94e5",
                     "number" : "0x01",
                     "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
                     "receiptTrie" : "0xa5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776ca",
@@ -150,10 +150,10 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef3122efd65ec31ed622cf809090aa198beeed8196318325015df1e3aa4d0058a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0a5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776cab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a03128eed4ff8d8fb20a28c766542607b68e9b28e8751b322c0dfef5db3aea3604886501030fa4a9b7fef862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef3122efd65ec31ed622cf809090aa198beeed8196318325015df1e3aa4d0058a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0a5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776cab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a019f9aa23831fe1413327836b157abd5427dcb63cc8eb96d2378acc7ea114c8e2884e19351af69e94e5f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -187,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x82359276c055dc42e8816c51b0710fdf77dadbc6213af73e4c56b9252f79c503",
+        "lastblockhash" : "0x619675e9eabe8d000f9a7ce2195f481a478dd9dab87d29819040ca6cca066f8f",
         "network" : "EIP150",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -245,257 +245,13 @@
             }
         }
     },
-    "delegatecallAndOOGatTxLevel_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/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json",
-            "sourceHash" : "17fae359b25224607e8233a537336d2948be5d06a740d9da2b0e47abcf90d5d6"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf131",
-                    "hash" : "0x34f643dc9e7790d16f73d1fb50db495d1bc969fd2287b57c44ef21672b8afd40",
-                    "mixHash" : "0x33504b0e791c4f5f6318806984f8303078b510403afab9d07361eeec93b82d56",
-                    "nonce" : "0xfaf17d456d34699d",
-                    "number" : "0x01",
-                    "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
-                    "receiptTrie" : "0xa5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776ca",
-                    "stateRoot" : "0xef3122efd65ec31ed622cf809090aa198beeed8196318325015df1e3aa4d0058",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ef3122efd65ec31ed622cf809090aa198beeed8196318325015df1e3aa4d0058a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0a5158620696a87bc5eb4cd4896da2f8383ff9b20416ed0b36228a3d70b9776cab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1318203e880a033504b0e791c4f5f6318806984f8303078b510403afab9d07361eeec93b82d5688faf17d456d34699df862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
-                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x3b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x34f643dc9e7790d16f73d1fb50db495d1bc969fd2287b57c44ef21672b8afd40",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f131",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7630ecf",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "delegatecallAndOOGatTxLevel_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/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json",
-            "sourceHash" : "17fae359b25224607e8233a537336d2948be5d06a740d9da2b0e47abcf90d5d6"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x9fedb92c2611bc2ddc7f4dd11702de22b8976f660c93639f76a567ea788fe066",
-                    "mixHash" : "0x4c9280ec179d36e771ef88f3546cbf7364b729fd00aacb1c19d1d82a1243065b",
-                    "nonce" : "0xc76b345041a61c91",
-                    "number" : "0x01",
-                    "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
-                    "receiptTrie" : "0x00f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072",
-                    "stateRoot" : "0x83b05f75d894434bc0f5589e54e3b40a0c34f62b9dc9032710c9435dea32b71f",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083b05f75d894434bc0f5589e54e3b40a0c34f62b9dc9032710c9435dea32b71fa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a000f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a04c9280ec179d36e771ef88f3546cbf7364b729fd00aacb1c19d1d82a1243065b88c76b345041a61c91f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
-                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x3b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16d",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9fedb92c2611bc2ddc7f4dd11702de22b8976f660c93639f76a567ea788fe066",
-        "network" : "Frontier",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824521c6c0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7363940",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5622dc6c1f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "delegatecallAndOOGatTxLevel_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/delegatecallAndOOGatTxLevel_d0g0v0Filler.json",
-            "sourceHash" : "17fae359b25224607e8233a537336d2948be5d06a740d9da2b0e47abcf90d5d6"
+            "sourceHash" : "1d1a2a98577230fd54652e8159c28e97c69af4bea66466949f538c618bd9480e"
         },
         "blocks" : [
             {
@@ -506,9 +262,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x8d598a35497ae5887deb92672640a9085a2f61296defd8153b684c4ace04b96e",
-                    "mixHash" : "0x1d542852f2e311dc315e83bacede07d34e40e9912253e2e9635f3a4abd6667ec",
-                    "nonce" : "0x775b3bd5f2edd111",
+                    "hash" : "0x58479e8638afe01b5ac746c016b0b391e72d12cea15dd45a988a34bbf9d29e73",
+                    "mixHash" : "0x55cb946f3c316fe6ad3056eee97cef09a6b8b76bffaa2c5871c10db11b5eccfb",
+                    "nonce" : "0x9179b848783f1446",
                     "number" : "0x01",
                     "parentHash" : "0x1ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360",
                     "receiptTrie" : "0x00f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072",
@@ -517,10 +273,10 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90261f901f9a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083b05f75d894434bc0f5589e54e3b40a0c34f62b9dc9032710c9435dea32b71fa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a000f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a01d542852f2e311dc315e83bacede07d34e40e9912253e2e9635f3a4abd6667ec88775b3bd5f2edd111f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90261f901f9a01ba043bcc08fddd4d2683db6f40a7091a749a4d9c8a923b408a77c45f5b94360a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa083b05f75d894434bc0f5589e54e3b40a0c34f62b9dc9032710c9435dea32b71fa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a000f9a329531a956fea9c7deafafe2c0feddc47dc35da81267d2cfa0537e95072b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a055cb946f3c316fe6ad3056eee97cef09a6b8b76bffaa2c5871c10db11b5eccfb889179b848783f1446f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -554,7 +310,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03b8cc89e060c74636d32df39a450e151ab736ed2c44847f15b6d627d4372d16da056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8d598a35497ae5887deb92672640a9085a2f61296defd8153b684c4ace04b96e",
+        "lastblockhash" : "0x58479e8638afe01b5ac746c016b0b391e72d12cea15dd45a988a34bbf9d29e73",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0.json
index fbf892f35..ad6cfd65d 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0.json
@@ -2,10 +2,10 @@
     "delegatecallBasic_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json",
-            "sourceHash" : "59109c4d30dc9a295ec17b56e0e5d2977349c5a3f5058d0199ff3dd0bd82d605"
+            "sourceHash" : "a07332f0483acbf7f6da9c3f3ec1da4358e280bbe8dbb4219b6432e28a5c6d5a"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf137",
-                    "hash" : "0x51bd0915eb1896a3990d7af7fd53a97f1a3630ff4f2ad2e5a4867d773d056897",
-                    "mixHash" : "0x2fb37b7d4e3b26f36b4932f7d51417502391d40634a35b6c597c1f966d0dc091",
-                    "nonce" : "0x30eb955435cd45e5",
+                    "hash" : "0x3a3232d2b3d6f1c75bb02d8babca16c646a7c5f95f84bcd7093227b5372617e8",
+                    "mixHash" : "0xde62489865ba4ef53de78f1058f467f179bcb0dd132ba8324e1b1b42be9b67e1",
+                    "nonce" : "0x588120f2c44a7573",
                     "number" : "0x01",
                     "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
                     "receiptTrie" : "0x92b4fe77720e0ce1e248b133d68abc4bb2fa148f7504552029c02ff9b5c4aef3",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0829694e8e4cea18c523674f37505ba0941abc855006879cc2148d5793fc183d5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a092b4fe77720e0ce1e248b133d68abc4bb2fa148f7504552029c02ff9b5c4aef3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a02fb37b7d4e3b26f36b4932f7d51417502391d40634a35b6c597c1f966d0dc0918830eb955435cd45e5f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0829694e8e4cea18c523674f37505ba0941abc855006879cc2148d5793fc183d5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a092b4fe77720e0ce1e248b133d68abc4bb2fa148f7504552029c02ff9b5c4aef3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a0de62489865ba4ef53de78f1058f467f179bcb0dd132ba8324e1b1b42be9b67e188588120f2c44a7573f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181eada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x51bd0915eb1896a3990d7af7fd53a97f1a3630ff4f2ad2e5a4867d773d056897",
+        "lastblockhash" : "0x3a3232d2b3d6f1c75bb02d8babca16c646a7c5f95f84bcd7093227b5372617e8",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -122,380 +122,13 @@
             }
         }
     },
-    "delegatecallBasic_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/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json",
-            "sourceHash" : "59109c4d30dc9a295ec17b56e0e5d2977349c5a3f5058d0199ff3dd0bd82d605"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf137",
-                    "hash" : "0x859af26250b232992fe42ccbc376b31c4acc2ab6b112d16436c9bccde36b59a8",
-                    "mixHash" : "0x9a296cfe8da3f47200b2a84a78b40e86308c60b2cff5674c2c8cc09a0cde7e09",
-                    "nonce" : "0xfc06e82838e3db2a",
-                    "number" : "0x01",
-                    "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
-                    "receiptTrie" : "0xba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86",
-                    "stateRoot" : "0x3cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0ba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a09a296cfe8da3f47200b2a84a78b40e86308c60b2cff5674c2c8cc09a0cde7e0988fc06e82838e3db2af862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
-                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x1b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181ead",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181eada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x859af26250b232992fe42ccbc376b31c4acc2ab6b112d16436c9bccde36b59a8",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f137",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7630ec9",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "delegatecallBasic_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/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json",
-            "sourceHash" : "59109c4d30dc9a295ec17b56e0e5d2977349c5a3f5058d0199ff3dd0bd82d605"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf137",
-                    "hash" : "0x8a68d0965fb291651adf080e1d4cb74aac2a063cb48d4787fe42654aab567e9e",
-                    "mixHash" : "0x54dc7cae9e22993b5f35b472e781631e131a37f1d340645e26bcebe61bfa9ffc",
-                    "nonce" : "0x765a6bbadf629ac1",
-                    "number" : "0x01",
-                    "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
-                    "receiptTrie" : "0xba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86",
-                    "stateRoot" : "0x3cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa03cc6ab363c89bca96c0f8036572d30f27d44e305f00eef0e5c538d7e97f12c29a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0ba32c52d3dc735892adcef99d22e36b65789d8031a9ce408edae83d221492b86b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1378203e880a054dc7cae9e22993b5f35b472e781631e131a37f1d340645e26bcebe61bfa9ffc88765a6bbadf629ac1f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
-                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x1b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181ead",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181eada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x8a68d0965fb291651adf080e1d4cb74aac2a063cb48d4787fe42654aab567e9e",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f137",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7630ec9",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "delegatecallBasic_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/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json",
-            "sourceHash" : "59109c4d30dc9a295ec17b56e0e5d2977349c5a3f5058d0199ff3dd0bd82d605"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x92624494859d3aad7e1f1eb3fd2e9ca4ae6dcf9fb2404d3ac780a444d51ace13",
-                    "mixHash" : "0x0ffeebac1eeb88a8c4e9a194b552a1850125f030a47fc136488badd7dda5bab9",
-                    "nonce" : "0x2ff3ef9270bbdf2c",
-                    "number" : "0x01",
-                    "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
-                    "receiptTrie" : "0x5743212fc2964fd6c561bec95eaad52e720ab13e578d3e22cbdce65a465943fd",
-                    "stateRoot" : "0x7940c56e4b021c8123223655b97efb3d91361c0cc839d926a667e75f9682df85",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07940c56e4b021c8123223655b97efb3d91361c0cc839d926a667e75f9682df85a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a05743212fc2964fd6c561bec95eaad52e720ab13e578d3e22cbdce65a465943fdb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a00ffeebac1eeb88a8c4e9a194b552a1850125f030a47fc136488badd7dda5bab9882ff3ef9270bbdf2cf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
-                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x1b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181ead",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181eada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x92624494859d3aad7e1f1eb3fd2e9ca4ae6dcf9fb2404d3ac780a444d51ace13",
-        "network" : "Frontier",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824521c6c0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7363940",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "delegatecallBasic_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/delegatecallBasic_d0g0v0Filler.json",
-            "sourceHash" : "59109c4d30dc9a295ec17b56e0e5d2977349c5a3f5058d0199ff3dd0bd82d605"
+            "sourceHash" : "a07332f0483acbf7f6da9c3f3ec1da4358e280bbe8dbb4219b6432e28a5c6d5a"
         },
         "blocks" : [
             {
@@ -506,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xeea3",
-                    "hash" : "0x0137d76b148a1a3ff9374ae179130ef6eeec2968aa74676906790d128a7807dc",
-                    "mixHash" : "0xa717e222b9c80d2ed166f61a49ec2f54d1249901cb7cfad569023ff0caba60ad",
-                    "nonce" : "0xda5bd9cba5797511",
+                    "hash" : "0xa385472b198a6a1c98d5aa6424e09f877f4d24032e7a04756fbd2e1c80a94e9e",
+                    "mixHash" : "0x13a12bfa19313ca55cc8ca3f2f722c026fc34629f453977600deaa1f51b34ac6",
+                    "nonce" : "0x681bd0a09a5b7733",
                     "number" : "0x01",
                     "parentHash" : "0xa72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fe",
                     "receiptTrie" : "0x356066076b765649670d45b17afe0247a5ab02ec67d162f0ca09df1c994b3a4f",
@@ -517,10 +150,10 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae4644c48e66ba15ce510c11eb52226d0fe56aeee15bc5f0b24937df3f691936a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0356066076b765649670d45b17afe0247a5ab02ec67d162f0ca09df1c994b3a4fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082eea38203e880a0a717e222b9c80d2ed166f61a49ec2f54d1249901cb7cfad569023ff0caba60ad88da5bd9cba5797511f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a0a72151156db5c0e2921059c490a1476feed22319c1a4be27f24a16a52b0345fea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ae4644c48e66ba15ce510c11eb52226d0fe56aeee15bc5f0b24937df3f691936a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0356066076b765649670d45b17afe0247a5ab02ec67d162f0ca09df1c994b3a4fb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082eea38203e880a013a12bfa19313ca55cc8ca3f2f722c026fc34629f453977600deaa1f51b34ac688681bd0a09a5b7733f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -554,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5519bf3432dabca8a840dfcffa11d2ace5e72c253f807d3c18fda89b181eada056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0137d76b148a1a3ff9374ae179130ef6eeec2968aa74676906790d128a7807dc",
+        "lastblockhash" : "0xa385472b198a6a1c98d5aa6424e09f877f4d24032e7a04756fbd2e1c80a94e9e",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0.json
index 69366da49..3b7867c36 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0.json
@@ -2,10 +2,10 @@
     "delegatecallEmptycontract_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json",
-            "sourceHash" : "16e5a357fd446f734e23fcc27141f321b185ae4ee768417a1e805ad30e04c1f5"
+            "sourceHash" : "fd4ebdb2b8806bccb1e1777f60db10b3fc9222fb6864f7278188431ac1e7e81f"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa2ff",
-                    "hash" : "0x66338ee56588f820051f4399cc6d98853c57e67ab1a27dc8ba3bdfc30a64b77b",
-                    "mixHash" : "0x55d9df87dfa28dd7a384c8aa3530ddef49be605597c0d6a9d76a9b626d412b81",
-                    "nonce" : "0x5fe3742fc0dd6290",
+                    "hash" : "0x97f6c0792dc1909d0ebad46f7834392d5c7745d9bfbe9e2cf8e747f672b69d22",
+                    "mixHash" : "0x4a211f0f7dd075f6b9b96a6fa778661ec2794fbcd47eb5f3230d873f84739c91",
+                    "nonce" : "0x45f5f518521ca52d",
                     "number" : "0x01",
                     "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
                     "receiptTrie" : "0x51ccf33bec5f4f553685c21415e109a6c5b867a07fd8796275e9b2b3aca16d64",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0c9af872597b9e96a995b56dd2371fcd37003a7a8483e7d8275075a6bcca0e0a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba051ccf33bec5f4f553685c21415e109a6c5b867a07fd8796275e9b2b3aca16d64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a055d9df87dfa28dd7a384c8aa3530ddef49be605597c0d6a9d76a9b626d412b81885fe3742fc0dd6290f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b0c9af872597b9e96a995b56dd2371fcd37003a7a8483e7d8275075a6bcca0e0a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba051ccf33bec5f4f553685c21415e109a6c5b867a07fd8796275e9b2b3aca16d64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a04a211f0f7dd075f6b9b96a6fa778661ec2794fbcd47eb5f3230d873f84739c918845f5f518521ca52df862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x019a54",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x66338ee56588f820051f4399cc6d98853c57e67ab1a27dc8ba3bdfc30a64b77b",
+        "lastblockhash" : "0x97f6c0792dc1909d0ebad46f7834392d5c7745d9bfbe9e2cf8e747f672b69d22",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -107,336 +107,13 @@
             }
         }
     },
-    "delegatecallEmptycontract_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/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json",
-            "sourceHash" : "16e5a357fd446f734e23fcc27141f321b185ae4ee768417a1e805ad30e04c1f5"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xa2ff",
-                    "hash" : "0xa79b19af3c1faf29eddcf5e7e91f4ec9750f9f45f677388eea83f167bf8050b3",
-                    "mixHash" : "0x95777eeefeffc67c38a1dedebf4670c1af9267f1415109442c44138e3e050824",
-                    "nonce" : "0x978d32c2fbb2f993",
-                    "number" : "0x01",
-                    "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
-                    "receiptTrie" : "0x1efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24",
-                    "stateRoot" : "0x4e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681a",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681aa04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba01efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a095777eeefeffc67c38a1dedebf4670c1af9267f1415109442c44138e3e05082488978d32c2fbb2f993f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x019a54",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x9b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5",
-                        "s" : "0x14381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa79b19af3c1faf29eddcf5e7e91f4ec9750f9f45f677388eea83f167bf8050b3",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x03e8",
-                "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a2ff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1025e1",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x03e8",
-                "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x10c8e0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "delegatecallEmptycontract_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/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json",
-            "sourceHash" : "16e5a357fd446f734e23fcc27141f321b185ae4ee768417a1e805ad30e04c1f5"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0xa2ff",
-                    "hash" : "0x2a1eda6855f2a5041e7c63967b72323225eca56e0a6fcd5ca78c25ed3cdd79fd",
-                    "mixHash" : "0x3c66fc08086cdee9794ecf871c4708849814aa1542796d640ad702ba2cd0a11d",
-                    "nonce" : "0x9db83181ad0230ba",
-                    "number" : "0x01",
-                    "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
-                    "receiptTrie" : "0x1efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24",
-                    "stateRoot" : "0x4e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681a",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04e2480319bc0661dc502039a4f70aa476533b37e0bda9b13614d4c7b76ff681aa04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba01efb31963b74c2116fc5020737cc728929409aed759c701609716db68ae04d24b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a2ff8203e880a03c66fc08086cdee9794ecf871c4708849814aa1542796d640ad702ba2cd0a11d889db83181ad0230baf862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x019a54",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x9b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5",
-                        "s" : "0x14381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2a1eda6855f2a5041e7c63967b72323225eca56e0a6fcd5ca78c25ed3cdd79fd",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x03e8",
-                "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4a2ff",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x1025e1",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x03e8",
-                "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x10c8e0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "delegatecallEmptycontract_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/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json",
-            "sourceHash" : "16e5a357fd446f734e23fcc27141f321b185ae4ee768417a1e805ad30e04c1f5"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x019a54",
-                    "hash" : "0xa712a61e1b9366928e278ea79cc40eac571f6cbc62722ea89acf23c29b90a5c0",
-                    "mixHash" : "0x9a8aa62f96854f17193d337a7ffe4a41bedbb4c798ba6f335100248bfb9e7f63",
-                    "nonce" : "0x343922261fd33db1",
-                    "number" : "0x01",
-                    "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
-                    "receiptTrie" : "0xee7eb1f3c7068073fd58f3f1c683cfa7fbc27d4047ffeed729bd44d84cd23979",
-                    "stateRoot" : "0xdae7c096eadb47cfc4c211924b07ef50643df93a90e15b9eb8187115849075f1",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0dae7c096eadb47cfc4c211924b07ef50643df93a90e15b9eb8187115849075f1a04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba0ee7eb1f3c7068073fd58f3f1c683cfa7fbc27d4047ffeed729bd44d84cd23979b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083019a548203e880a09a8aa62f96854f17193d337a7ffe4a41bedbb4c798ba6f335100248bfb9e7f6388343922261fd33db1f862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x019a54",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x9b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5",
-                        "s" : "0x14381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xa712a61e1b9366928e278ea79cc40eac571f6cbc62722ea89acf23c29b90a5c0",
-        "network" : "Frontier",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x03e8",
-                "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f59a54",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0f2e8c",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x03e8",
-                "code" : "0x604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b561c350f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x10c8e0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "delegatecallEmptycontract_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/delegatecallEmptycontract_d0g0v0Filler.json",
-            "sourceHash" : "16e5a357fd446f734e23fcc27141f321b185ae4ee768417a1e805ad30e04c1f5"
+            "sourceHash" : "fd4ebdb2b8806bccb1e1777f60db10b3fc9222fb6864f7278188431ac1e7e81f"
         },
         "blocks" : [
             {
@@ -447,9 +124,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0xa06b",
-                    "hash" : "0x1b8fb7182cc67c33222e85d3797893e98a46ebeae03468928416c141b78796e7",
-                    "mixHash" : "0x3cc77f109388b401572da04d68dddcd2a418efe862767b265073c2bce2be9c93",
-                    "nonce" : "0xd12feac35d4b1dab",
+                    "hash" : "0x1aa07f19a23991fddfc493c390745ac32ab2d0866345930a686a0063bfbe6d24",
+                    "mixHash" : "0x26fd254133d44cd36118f0360993eb37468e2d50786280ff9c34f5ef75630b1c",
+                    "nonce" : "0x6a47e1cf47f8b30b",
                     "number" : "0x01",
                     "parentHash" : "0x5554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7",
                     "receiptTrie" : "0xe1837bd4f862fc5c4eaf86d8403074c1a12a61fecabc43cc6b9cd9151ee73abc",
@@ -458,10 +135,10 @@
                     "transactionsTrie" : "0x4622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10b",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ef2dfac90db4343a8b27fc1c588daeffd503ede295b55ba91a2dd7f18d6eadda04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba0e1837bd4f862fc5c4eaf86d8403074c1a12a61fecabc43cc6b9cd9151ee73abcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a06b8203e880a03cc77f109388b401572da04d68dddcd2a418efe862767b265073c2bce2be9c9388d12feac35d4b1dabf862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
+                "rlp" : "0xf9025ff901f7a05554ae56efdb14354099952ee117e5ec4a5898fc83b3a07c20f34aedb093def7a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08ef2dfac90db4343a8b27fc1c588daeffd503ede295b55ba91a2dd7f18d6eadda04622bcb7ed1149573f5fae98048764eee2b2b6261af0f0c68fbef56a3d82d10ba0e1837bd4f862fc5c4eaf86d8403074c1a12a61fecabc43cc6b9cd9151ee73abcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424082a06b8203e880a026fd254133d44cd36118f0360993eb37468e2d50786280ff9c34f5ef75630b1c886a47e1cf47f8b30bf862f860800183019a5494100000000000000000000000000000000000000080801ba09b85ed929e27be6c4a0c284109265828d4a0dbc83102cbedb0bc7fce73d6bbd5a014381d5d756dbcbd0ea8b61be69fe8e59bdf0980019aa766ae46d5727c7b9b31c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x019a54",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -495,7 +172,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ececde622a13eb4eb886a9e03552791b8e6477f2602bf7f6d175db443d2f2b87a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x1b8fb7182cc67c33222e85d3797893e98a46ebeae03468928416c141b78796e7",
+        "lastblockhash" : "0x1aa07f19a23991fddfc493c390745ac32ab2d0866345930a686a0063bfbe6d24",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0.json
index 2e23c8351..0d9f29b38 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0.json
@@ -2,10 +2,10 @@
     "delegatecallInInitcodeToEmptyContract_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json",
-            "sourceHash" : "91617fa2ba223c03e5e02aad5de31eeb9fc2c3708241175cc72d0dc937e2ecc3"
+            "sourceHash" : "93656313781fbf3b3e677129819355dad403200279e352c657be87a2535cceb2"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x012020",
-                    "hash" : "0x0f30c16d04803971ff7fcb275b0df1ef5e718dc48a3eeab39bd59ac6cbb2d54c",
-                    "mixHash" : "0xf4796183ca7fc704fc0da730ca4032674da560f5a073b9d5021e1ad4b7907204",
-                    "nonce" : "0xd1616e95a4ee1ba3",
+                    "hash" : "0x119e3c0ae9df2f3714b233dbb7629faa930424788abae11a9e71031b9731eb36",
+                    "mixHash" : "0xe3c651274b5eaf2cbb030bcffaf1652a494a1e29f502f7cafc5209c8bf1c2449",
+                    "nonce" : "0xd7c41310fc95c3b8",
                     "number" : "0x01",
                     "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
                     "receiptTrie" : "0x2f16a0a23c3553b9a7f3a5d5d7e0dd51d8fc9da54742161e91a6d3de5e827bd4",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac8b32932e36dc9502c7b3418e0e42244bc254a17c7d81b3fc7ffb504df9e529a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a02f16a0a23c3553b9a7f3a5d5d7e0dd51d8fc9da54742161e91a6d3de5e827bd4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a0f4796183ca7fc704fc0da730ca4032674da560f5a073b9d5021e1ad4b790720488d1616e95a4ee1ba3f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ac8b32932e36dc9502c7b3418e0e42244bc254a17c7d81b3fc7ffb504df9e529a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a02f16a0a23c3553b9a7f3a5d5d7e0dd51d8fc9da54742161e91a6d3de5e827bd4b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a0e3c651274b5eaf2cbb030bcffaf1652a494a1e29f502f7cafc5209c8bf1c244988d7c41310fc95c3b8f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x0f30c16d04803971ff7fcb275b0df1ef5e718dc48a3eeab39bd59ac6cbb2d54c",
+        "lastblockhash" : "0x119e3c0ae9df2f3714b233dbb7629faa930424788abae11a9e71031b9731eb36",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -114,350 +114,13 @@
             }
         }
     },
-    "delegatecallInInitcodeToEmptyContract_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/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json",
-            "sourceHash" : "91617fa2ba223c03e5e02aad5de31eeb9fc2c3708241175cc72d0dc937e2ecc3"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x012020",
-                    "hash" : "0x9c803e61ae22143f84cff31203ff05e3b5d52ec96cf2e9f162677c49f28a1617",
-                    "mixHash" : "0xd12be8a9bcb2b73da59ea7ea349a16ef1cb66fc4bb07fc3aeb5aca89119a4a90",
-                    "nonce" : "0xebe05daf6c6a2237",
-                    "number" : "0x01",
-                    "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
-                    "receiptTrie" : "0x03e139caf55a87fe43cbb410b1cd84a309c5d89ad6cdda3d822088de24137df7",
-                    "stateRoot" : "0x517424ad4779fea5e8c2a45ea3ae190abbb8548e29f0f25d8eaceda755f4f03a",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0517424ad4779fea5e8c2a45ea3ae190abbb8548e29f0f25d8eaceda755f4f03aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a003e139caf55a87fe43cbb410b1cd84a309c5d89ad6cdda3d822088de24137df7b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a0d12be8a9bcb2b73da59ea7ea349a16ef1cb66fc4bb07fc3aeb5aca89119a4a9088ebe05daf6c6a2237f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x06e9d9",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
-                        "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x6ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9c803e61ae22143f84cff31203ff05e3b5d52ec96cf2e9f162677c49f28a1617",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x270f",
-                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055000000000000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
-                "balance" : "0x01",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f52020",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbfdfe0",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x2710",
-                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055000000000000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fc10000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "delegatecallInInitcodeToEmptyContract_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/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json",
-            "sourceHash" : "91617fa2ba223c03e5e02aad5de31eeb9fc2c3708241175cc72d0dc937e2ecc3"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x012020",
-                    "hash" : "0x829bdb797c9d7bdfb4749c171656681ac139e7a291d3ad859a2c33503f5066d4",
-                    "mixHash" : "0x1bdf88604447541b89b17e94eb5f5a1c870123f273962a7be4fa721be8d01d28",
-                    "nonce" : "0x169e037162a6ee3f",
-                    "number" : "0x01",
-                    "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
-                    "receiptTrie" : "0x26459230796edfd450319739da8d1897bbfb79a3814bc094a5dd5f70dfb3e712",
-                    "stateRoot" : "0x25b94b0a64b461e1a9a5f20ace7b0a218a99ea6930e990c3ca6a0046c21d9a0a",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa025b94b0a64b461e1a9a5f20ace7b0a218a99ea6930e990c3ca6a0046c21d9a0aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a026459230796edfd450319739da8d1897bbfb79a3814bc094a5dd5f70dfb3e712b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830120208203e880a01bdf88604447541b89b17e94eb5f5a1c870123f273962a7be4fa721be8d01d2888169e037162a6ee3ff862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x06e9d9",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
-                        "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x6ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x829bdb797c9d7bdfb4749c171656681ac139e7a291d3ad859a2c33503f5066d4",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x270f",
-                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055000000000000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
-                "balance" : "0x01",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f52020",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbfdfe0",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x2710",
-                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055000000000000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fc10000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "delegatecallInInitcodeToEmptyContract_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/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json",
-            "sourceHash" : "91617fa2ba223c03e5e02aad5de31eeb9fc2c3708241175cc72d0dc937e2ecc3"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x06e9d9",
-                    "hash" : "0x3393e65f31a23076529993453385273690912b35cfdb1937841e35e4893ea964",
-                    "mixHash" : "0xc8273073c24ebb76a0edf0c8f374516055f994205cd22f4167a192f04697fb46",
-                    "nonce" : "0x40e83f4c2246bc52",
-                    "number" : "0x01",
-                    "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
-                    "receiptTrie" : "0xcacd1eedcdb49fae43f670055661f1ad5f316fbca9bbf690d31f8e7d6e98219a",
-                    "stateRoot" : "0x1b5b30c456e23ccc2fec283f54b9306872b76dd6dd6081133043985134db02f1",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01b5b30c456e23ccc2fec283f54b9306872b76dd6dd6081133043985134db02f1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0cacd1eedcdb49fae43f670055661f1ad5f316fbca9bbf690d31f8e7d6e98219ab90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a0c8273073c24ebb76a0edf0c8f374516055f994205cd22f4167a192f04697fb468840e83f4c2246bc52f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x06e9d9",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
-                        "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x6ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3393e65f31a23076529993453385273690912b35cfdb1937841e35e4893ea964",
-        "network" : "Frontier",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x2710",
-                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055000000000000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fae9d9",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fba1627",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x2710",
-                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055000000000000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fc10000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "delegatecallInInitcodeToEmptyContract_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToEmptyContract_d0g0v0Filler.json",
-            "sourceHash" : "91617fa2ba223c03e5e02aad5de31eeb9fc2c3708241175cc72d0dc937e2ecc3"
+            "sourceHash" : "93656313781fbf3b3e677129819355dad403200279e352c657be87a2535cceb2"
         },
         "blocks" : [
             {
@@ -468,9 +131,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x011d8c",
-                    "hash" : "0x870f8f0347309094a2dab17409213dd502deb130b73369ffd20ca5f4adfee4f9",
-                    "mixHash" : "0x17cdf3eb0d85c47cfe529b75f2ff258fee99b3c6f4f8f9b75b350345d58b655e",
-                    "nonce" : "0xa1fdf1e0ca153875",
+                    "hash" : "0xca5ab656fa4877f9921942d165e2cee9b5d035b9dccbdc04f8e9e4fa05684f04",
+                    "mixHash" : "0x0060f62b2dc38b1db51d5c483c38c9ad5cd9417776cbfedba7f915c0391c2563",
+                    "nonce" : "0x5e8bc248b20d002c",
                     "number" : "0x01",
                     "parentHash" : "0x3df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830",
                     "receiptTrie" : "0x67210836eb487b6d0b14cf2f9b512c2669bd43e2eed70f476029e2e655e7be80",
@@ -479,10 +142,10 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c70c431f295302fd1cace28d06be865cf7667091d367518ed65eb4a49e162f5ea074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a067210836eb487b6d0b14cf2f9b512c2669bd43e2eed70f476029e2e655e7be80b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d8c8203e880a017cdf3eb0d85c47cfe529b75f2ff258fee99b3c6f4f8f9b75b350345d58b655e88a1fdf1e0ca153875f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a03df127c35bf54a9d6b6c93edf654bf38ca2f57053a6f154d27fc10d15ae02830a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0c70c431f295302fd1cace28d06be865cf7667091d367518ed65eb4a49e162f5ea074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a067210836eb487b6d0b14cf2f9b512c2669bd43e2eed70f476029e2e655e7be80b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083011d8c8203e880a00060f62b2dc38b1db51d5c483c38c9ad5cd9417776cbfedba7f915c0391c2563885e8bc248b20d002cf862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -516,7 +179,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa06ca6ed889c20b20d86b9e71b760d1cbd8410292ca4c112d35f3795e8cf7c0d01a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x870f8f0347309094a2dab17409213dd502deb130b73369ffd20ca5f4adfee4f9",
+        "lastblockhash" : "0xca5ab656fa4877f9921942d165e2cee9b5d035b9dccbdc04f8e9e4fa05684f04",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0.json
index b7834c723..5a4c090b4 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0.json
@@ -1,525 +1,11 @@
 {
-    "delegatecallInInitcodeToExistingContractOOG_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++",
-            "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json",
-            "sourceHash" : "7086283a6350857d1648bbca12a7ced680d8bf49c0776c54c65f52850aab6892"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x01bc6b",
-                    "hash" : "0x9725e10c5b5108b96266ba64af406ce2a411f4d6407c10d6a1a995c365af99bb",
-                    "mixHash" : "0x434fa76e1a63c29e8033a4177f41388f526a35cc260ca0643bbc5a896b727128",
-                    "nonce" : "0xf3ee26c7d4e75f2f",
-                    "number" : "0x01",
-                    "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
-                    "receiptTrie" : "0x0e3128f93c22ee7acc57ea8aa384a07fe0df6e0d62d74bf7f94bf2ab2ac7efb6",
-                    "stateRoot" : "0xb91fe7501f4c0c837cfd69c2ad2efd207a6a460e3a68fd18d6afad3451376ed1",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b91fe7501f4c0c837cfd69c2ad2efd207a6a460e3a68fd18d6afad3451376ed1a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa00e3128f93c22ee7acc57ea8aa384a07fe0df6e0d62d74bf7f94bf2ab2ac7efb6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a0434fa76e1a63c29e8033a4177f41388f526a35cc260ca0643bbc5a896b72712888f3ee26c7d4e75f2ff862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x025608",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbe5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1ae",
-                        "s" : "0x6565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265c",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x9725e10c5b5108b96266ba64af406ce2a411f4d6407c10d6a1a995c365af99bb",
-        "network" : "Byzantium",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x270b",
-                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600a5533600b550000000000000000000000000000000000000000000000602052604060006005f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
-                "balance" : "0x05",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                    "0x02" : "0x01",
-                    "0x0a" : "0x01",
-                    "0x0b" : "0x1000000000000000000000000000000000000000"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x29a2241af62dbc6b",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x00",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbf4395",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x2710",
-                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600a5533600b550000000000000000000000000000000000000000000000602052604060006005f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x00",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fc10000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "delegatecallInInitcodeToExistingContractOOG_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/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json",
-            "sourceHash" : "7086283a6350857d1648bbca12a7ced680d8bf49c0776c54c65f52850aab6892"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x01bc6b",
-                    "hash" : "0x18650b7fb1d298a50d9a25b009e3da4e9fb7c113ec30dc7be4d757d430263e59",
-                    "mixHash" : "0x7ea718160b99c9aabb7c46d61e9e9c27f89009b1ad813d593891bc1ec0674bc5",
-                    "nonce" : "0xf88be0c0e54c391a",
-                    "number" : "0x01",
-                    "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
-                    "receiptTrie" : "0xd8941509fc4e7d535a756a15b8ff70c5959d18153672fea15d76386a821e7b80",
-                    "stateRoot" : "0xacf851a4e013be253da41511af9a82427a2d73f06b327456a13d114ad1b301b9",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0acf851a4e013be253da41511af9a82427a2d73f06b327456a13d114ad1b301b9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0d8941509fc4e7d535a756a15b8ff70c5959d18153672fea15d76386a821e7b80b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a07ea718160b99c9aabb7c46d61e9e9c27f89009b1ad813d593891bc1ec0674bc588f88be0c0e54c391af862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x025608",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbe5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1ae",
-                        "s" : "0x6565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265c",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x18650b7fb1d298a50d9a25b009e3da4e9fb7c113ec30dc7be4d757d430263e59",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x270b",
-                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600a5533600b550000000000000000000000000000000000000000000000602052604060006005f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
-                "balance" : "0x05",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x02" : "0x01",
-                    "0x0a" : "0x01",
-                    "0x0b" : "0x1000000000000000000000000000000000000000"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5bc6b",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x00",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbf4395",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x2710",
-                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600a5533600b550000000000000000000000000000000000000000000000602052604060006005f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x00",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fc10000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "delegatecallInInitcodeToExistingContractOOG_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/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json",
-            "sourceHash" : "7086283a6350857d1648bbca12a7ced680d8bf49c0776c54c65f52850aab6892"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x01bc6b",
-                    "hash" : "0xc348bd5a9d31ea5ec6ff07a585db711c40f8f70f1ced716e009decd0f437891e",
-                    "mixHash" : "0xd3d3c90199b0a7ac245c6d2a0fc90670b2ac63572b1500154b26bcc9fc0766a5",
-                    "nonce" : "0xe2e4906f65a62a6a",
-                    "number" : "0x01",
-                    "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
-                    "receiptTrie" : "0x9e324b941558bd5016bf074d54e4e332afb2353ef628ac8cc744e17f11a44bf6",
-                    "stateRoot" : "0xecb4c9c8bc797e1dd17a8d213cc08efee28c776e0ae26f2058f363d932c7eaa3",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ecb4c9c8bc797e1dd17a8d213cc08efee28c776e0ae26f2058f363d932c7eaa3a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa09e324b941558bd5016bf074d54e4e332afb2353ef628ac8cc744e17f11a44bf6b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301bc6b8203e880a0d3d3c90199b0a7ac245c6d2a0fc90670b2ac63572b1500154b26bcc9fc0766a588e2e4906f65a62a6af862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x025608",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbe5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1ae",
-                        "s" : "0x6565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265c",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc348bd5a9d31ea5ec6ff07a585db711c40f8f70f1ced716e009decd0f437891e",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x270b",
-                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600a5533600b550000000000000000000000000000000000000000000000602052604060006005f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
-                "balance" : "0x05",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                    "0x02" : "0x01",
-                    "0x0a" : "0x01",
-                    "0x0b" : "0x1000000000000000000000000000000000000000"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f5bc6b",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x00",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbf4395",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x2710",
-                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600a5533600b550000000000000000000000000000000000000000000000602052604060006005f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x00",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fc10000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "delegatecallInInitcodeToExistingContractOOG_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/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json",
-            "sourceHash" : "7086283a6350857d1648bbca12a7ced680d8bf49c0776c54c65f52850aab6892"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x025608",
-                    "hash" : "0x15f63a86143fb6bab619c215f4a2e9caee9ce42e07120993ff675f6f060d1dba",
-                    "mixHash" : "0xf6b5a2f159223a61787ab4d5e422d9faa96b7681d7ad1d4fd3b8331b45b6b4ba",
-                    "nonce" : "0x7e91dee7465877fe",
-                    "number" : "0x01",
-                    "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
-                    "receiptTrie" : "0xefda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642",
-                    "stateRoot" : "0xcf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0efda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830256088203e880a0f6b5a2f159223a61787ab4d5e422d9faa96b7681d7ad1d4fd3b8331b45b6b4ba887e91dee7465877fef862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x025608",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xbe5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1ae",
-                        "s" : "0x6565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265c",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xe385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x15f63a86143fb6bab619c215f4a2e9caee9ce42e07120993ff675f6f060d1dba",
-        "network" : "Frontier",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x2710",
-                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600a5533600b550000000000000000000000000000000000000000000000602052604060006005f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f65608",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x00",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbea9f8",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x2710",
-                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600a5533600b550000000000000000000000000000000000000000000000602052604060006005f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x00",
-                "code" : "0x6001600255",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fc10000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "delegatecallInInitcodeToExistingContractOOG_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContractOOG_d0g0v0Filler.json",
-            "sourceHash" : "7086283a6350857d1648bbca12a7ced680d8bf49c0776c54c65f52850aab6892"
+            "sourceHash" : "d10f5747215d466b779f67c6d811adeacf913717af685cea77a1b5fbff50165a"
         },
         "blocks" : [
             {
@@ -530,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x025608",
-                    "hash" : "0x6f8baca385e0dc6c6eeac673a6b813fdeff2df44d52359d4aa0457f538fd6d6c",
-                    "mixHash" : "0xbcf9291dd1ca153a250e1ef0370e5eca69ad941a0893fb5e4f5208043c9b88f8",
-                    "nonce" : "0xe91026f87c7d1d3b",
+                    "hash" : "0x113e8775a8f369c399a643ff7112860206baea1fe6de0587502faa4c0e37e226",
+                    "mixHash" : "0xffb9f8d8c86a7733a0d78610e1ba387fecb627053951e197824d2863119163b4",
+                    "nonce" : "0xdc9b25e9433939f2",
                     "number" : "0x01",
                     "parentHash" : "0xbf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9a",
                     "receiptTrie" : "0xefda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642",
@@ -541,10 +27,10 @@
                     "transactionsTrie" : "0xbe9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849ca",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0efda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830256088203e880a0bcf9291dd1ca153a250e1ef0370e5eca69ad941a0893fb5e4f5208043c9b88f888e91026f87c7d1d3bf862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
+                "rlp" : "0xf90260f901f8a0bf8a4b6286cf8e8cb15eb31bae6e2da8b9c6042b2168e5c5882bb1b2e2686a9aa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf5ff363f86acfae0657488260fcfca782d31e88b6f7c80fd6ca2c58d247f2c9a0be9e029ed654b35b64030ce3878b3c599673652b7e5043daf31c8e30a41849caa0efda08f24a21de0d501b050e60750ffe279268722a91cd9237024dd279f6b642b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830256088203e880a0ffb9f8d8c86a7733a0d78610e1ba387fecb627053951e197824d2863119163b488dc9b25e9433939f2f862f86080018302560894100000000000000000000000000000000000000080801ba0be5b659530ef080039d678223a4bc55918ea6c1b60812e8a7e5efdd16e46f1aea06565c897f85a3acfbfbee16dc465d991d817592d398db21f41b585be898c265cc0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x025608",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -578,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0e385a9523c74cf8f4811a380c272e4b534bfe7f8084a22d1944fea197ab6e700a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6f8baca385e0dc6c6eeac673a6b813fdeff2df44d52359d4aa0457f538fd6d6c",
+        "lastblockhash" : "0x113e8775a8f369c399a643ff7112860206baea1fe6de0587502faa4c0e37e226",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0.json
index 96fe90d08..ca050114f 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0.json
@@ -2,10 +2,10 @@
     "delegatecallInInitcodeToExistingContract_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json",
-            "sourceHash" : "7f051c790c70ccb6fdb5a5f20e12204442c5499d8b22bba0e3cc252be4c646c4"
+            "sourceHash" : "ddead1a59f597fff5ed26aeea83c55361e2cef361c1fc05e027accd97baeb21c"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x020a90",
-                    "hash" : "0x7850a2b7de2ba7ff859407a36782647e40f14a4afbea92257b05d7041f64b5ba",
-                    "mixHash" : "0xdf43d4d51d18b50c8c914996960a2a2f6e267f3f0ca6f19f3e8d185174f7dcc7",
-                    "nonce" : "0x5ec25a9001d29b44",
+                    "hash" : "0x49bd050e882211c1fc129a4e69eb1a71ab9192ba734400243328a25243fcd70f",
+                    "mixHash" : "0x9521dfae222cebfc592f9c9d7236d594de19c4355955f9bbbe71763f8845dd48",
+                    "nonce" : "0x2f8395c0dea3bd16",
                     "number" : "0x01",
                     "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
                     "receiptTrie" : "0x0e7e01517099c69abfaa43aaf196aef8884a16e3667b907aebfd41f419e325b2",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05696e3700fe35114f2c429562113e0a3920ae810d929b5a1576edd994facd5f5a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00e7e01517099c69abfaa43aaf196aef8884a16e3667b907aebfd41f419e325b2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a0df43d4d51d18b50c8c914996960a2a2f6e267f3f0ca6f19f3e8d185174f7dcc7885ec25a9001d29b44f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05696e3700fe35114f2c429562113e0a3920ae810d929b5a1576edd994facd5f5a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00e7e01517099c69abfaa43aaf196aef8884a16e3667b907aebfd41f419e325b2b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a09521dfae222cebfc592f9c9d7236d594de19c4355955f9bbbe71763f8845dd48882f8395c0dea3bd16f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7850a2b7de2ba7ff859407a36782647e40f14a4afbea92257b05d7041f64b5ba",
+        "lastblockhash" : "0x49bd050e882211c1fc129a4e69eb1a71ab9192ba734400243328a25243fcd70f",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -145,440 +145,13 @@
             }
         }
     },
-    "delegatecallInInitcodeToExistingContract_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/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json",
-            "sourceHash" : "7f051c790c70ccb6fdb5a5f20e12204442c5499d8b22bba0e3cc252be4c646c4"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x020a90",
-                    "hash" : "0xe142605e8be30ed37960c18ea31e7d67573c0e88195079ca56a7fed97fa4fd97",
-                    "mixHash" : "0xb1e136f22fbb55abfe1e97f247a514db29401a0996a50ac9528b2dabe138a4b4",
-                    "nonce" : "0x78aff47aa4f21107",
-                    "number" : "0x01",
-                    "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
-                    "receiptTrie" : "0x89a44293316b8924ebe2508be0a8e12f3e55913e90c4c118d41e3036c0f1ab64",
-                    "stateRoot" : "0xaa7bdc0aa7ce71f857c267aba1d181e5243623b5added933a0e39417df2a7983",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aa7bdc0aa7ce71f857c267aba1d181e5243623b5added933a0e39417df2a7983a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a089a44293316b8924ebe2508be0a8e12f3e55913e90c4c118d41e3036c0f1ab64b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a0b1e136f22fbb55abfe1e97f247a514db29401a0996a50ac9528b2dabe138a4b48878aff47aa4f21107f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x06e9d9",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
-                        "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafa",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe142605e8be30ed37960c18ea31e7d67573c0e88195079ca56a7fed97fa4fd97",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x270f",
-                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055336001550000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x03e8",
-                "code" : "0x6460016000556000526005601b6001f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
-                "balance" : "0x01",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x1000000000000000000000000000000000000000",
-                    "0x02" : "0x01",
-                    "0x0b" : "0x1000000000000000000000000000000000000000"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f60a90",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x00",
-                "code" : "0x600160025533600b55",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbef570",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x2710",
-                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055336001550000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x03e8",
-                "code" : "0x6460016000556000526005601b6001f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x00",
-                "code" : "0x600160025533600b55",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fc10000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "delegatecallInInitcodeToExistingContract_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/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json",
-            "sourceHash" : "7f051c790c70ccb6fdb5a5f20e12204442c5499d8b22bba0e3cc252be4c646c4"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x020a90",
-                    "hash" : "0xe52822b92e420486b07e2d0d5d2fc7a63392f42253c74122aeaad5ff204efe65",
-                    "mixHash" : "0xf83ec2ccc0189545a293fade1799ce19e641bfe05ddef79eff55baeae7e071a0",
-                    "nonce" : "0x93c23e041c28952f",
-                    "number" : "0x01",
-                    "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
-                    "receiptTrie" : "0x937862e163554312a533aeacf648e6a35544e317b952c2ca57cc4f8ef397f2f8",
-                    "stateRoot" : "0x4dc4dae84a36654d8bdf84fb16708a5d451ef2db62c1b627ec673c6661e1ea55",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa04dc4dae84a36654d8bdf84fb16708a5d451ef2db62c1b627ec673c6661e1ea55a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0937862e163554312a533aeacf648e6a35544e317b952c2ca57cc4f8ef397f2f8b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083020a908203e880a0f83ec2ccc0189545a293fade1799ce19e641bfe05ddef79eff55baeae7e071a08893c23e041c28952ff862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x06e9d9",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
-                        "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafa",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe52822b92e420486b07e2d0d5d2fc7a63392f42253c74122aeaad5ff204efe65",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x270f",
-                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055336001550000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x03e8",
-                "code" : "0x6460016000556000526005601b6001f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
-                "balance" : "0x01",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x1000000000000000000000000000000000000000",
-                    "0x02" : "0x01",
-                    "0x0b" : "0x1000000000000000000000000000000000000000"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f60a90",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x00",
-                "code" : "0x600160025533600b55",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbef570",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x2710",
-                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055336001550000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x03e8",
-                "code" : "0x6460016000556000526005601b6001f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x00",
-                "code" : "0x600160025533600b55",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fc10000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "delegatecallInInitcodeToExistingContract_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/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json",
-            "sourceHash" : "7f051c790c70ccb6fdb5a5f20e12204442c5499d8b22bba0e3cc252be4c646c4"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x06e9d9",
-                    "hash" : "0xb8900fce3a6a9a91b0b3a068220951dba9289e939a50678d9524f1d2d2022bdf",
-                    "mixHash" : "0x2fdc305bd8cf40e349e3e727b09fcee590512564703b7ff48a33467d978c2960",
-                    "nonce" : "0xf0fa585985d37c92",
-                    "number" : "0x01",
-                    "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
-                    "receiptTrie" : "0x640593a82f35388fc7f4b468500f1b454ede7cdf4435416d054d416b1882b13c",
-                    "stateRoot" : "0x834d057574ca9e23a4045eb629f3238ede22bc663cd4100f1064146e2926daa1",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0834d057574ca9e23a4045eb629f3238ede22bc663cd4100f1064146e2926daa1a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0640593a82f35388fc7f4b468500f1b454ede7cdf4435416d054d416b1882b13cb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a02fdc305bd8cf40e349e3e727b09fcee590512564703b7ff48a33467d978c296088f0fa585985d37c92f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x06e9d9",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
-                        "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafa",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb8900fce3a6a9a91b0b3a068220951dba9289e939a50678d9524f1d2d2022bdf",
-        "network" : "Frontier",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x2710",
-                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055336001550000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x03e8",
-                "code" : "0x6460016000556000526005601b6001f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fae9d9",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x00",
-                "code" : "0x600160025533600b55",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fba1627",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x2710",
-                "code" : "0x7f604060006040600073945304eb96065b2a98b57a48a06ae28d285a71b56201866000527fa0f4600055336001550000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x1000000000000000000000000000000000000001" : {
-                "balance" : "0x03e8",
-                "code" : "0x6460016000556000526005601b6001f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x00",
-                "code" : "0x600160025533600b55",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fc10000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "delegatecallInInitcodeToExistingContract_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/delegatecallInInitcodeToExistingContract_d0g0v0Filler.json",
-            "sourceHash" : "7f051c790c70ccb6fdb5a5f20e12204442c5499d8b22bba0e3cc252be4c646c4"
+            "sourceHash" : "ddead1a59f597fff5ed26aeea83c55361e2cef361c1fc05e027accd97baeb21c"
         },
         "blocks" : [
             {
@@ -589,9 +162,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x0207fc",
-                    "hash" : "0x80971ab6687f2bd5f4c2feb0c867b8a2a83d45376090e49099cbd9bbd826e992",
-                    "mixHash" : "0xf06b81927da6352ee24d6c073115eb5754f53f5580eed2493bd3955bc30f4e67",
-                    "nonce" : "0xee3e4018fc5fe084",
+                    "hash" : "0x996f7419ceadde0aa46f7cef074682418ad086744ab69266c06c2ecf9e6fcf26",
+                    "mixHash" : "0xf6ddce0e602dc9ce0b09a96c68b2f7ec7c987a0d9304295d69fb229890b13e1f",
+                    "nonce" : "0xe4648fdc00647342",
                     "number" : "0x01",
                     "parentHash" : "0x25b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70ae",
                     "receiptTrie" : "0x2530b2bc97e4208028782a292c202a91a10857ba28096db427229d9a146c4050",
@@ -600,10 +173,10 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3a796a212316ebf6757d1cf3c734f2b0fc2e2991e9f746b8b085d43e0b9792ba074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a02530b2bc97e4208028782a292c202a91a10857ba28096db427229d9a146c4050b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830207fc8203e880a0f06b81927da6352ee24d6c073115eb5754f53f5580eed2493bd3955bc30f4e6788ee3e4018fc5fe084f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a025b8258f5c6333515e4298eaef4c9cd4e622e03e769a451b12a1497fc85e70aea01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0b3a796a212316ebf6757d1cf3c734f2b0fc2e2991e9f746b8b085d43e0b9792ba074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a02530b2bc97e4208028782a292c202a91a10857ba28096db427229d9a146c4050b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f4240830207fc8203e880a0f6ddce0e602dc9ce0b09a96c68b2f7ec7c987a0d9304295d69fb229890b13e1f88e4648fdc00647342f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -637,7 +210,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0324313f4c5dabb0d09e35628a0e33a7ecaeb742a98aa8c588bac451e1802fafaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x80971ab6687f2bd5f4c2feb0c867b8a2a83d45376090e49099cbd9bbd826e992",
+        "lastblockhash" : "0x996f7419ceadde0aa46f7cef074682418ad086744ab69266c06c2ecf9e6fcf26",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0.json
index 85a106293..9785d3b93 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0.json
@@ -2,10 +2,10 @@
     "delegatecallOOGinCall_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json",
-            "sourceHash" : "4f668b5e70ef44957d02fcea4a24a08245098825457ae83ade60588e153c5d9e"
+            "sourceHash" : "b5b65b12d13dfd996ba1027a1bdbdbba6bd0edda5a25c6961fc02b1ba6a935f0"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xca0f",
-                    "hash" : "0x541f8b811fc96cdbeaef4753139ed1e4e97df1700a2146d34f37eb80b8dc40d4",
-                    "mixHash" : "0x851e44981b1e1c0e10825dff9a609f17fbe4c460f63e030b2bef8fd152f64047",
-                    "nonce" : "0x69959afe7118410f",
+                    "hash" : "0x4557693c9467e326842d4d727665ed2598087afbae146035ab3e454e0cd0bbcd",
+                    "mixHash" : "0x699a09c1e6cccec1ef821f3fc7b839160c6b01c50e744a035790ed287398d670",
+                    "nonce" : "0xcd697a389eb1b6fc",
                     "number" : "0x01",
                     "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
                     "receiptTrie" : "0xb7c28c49ea9027aa16c8d7b6bfb425ee484c1a29e0d45de20421428335987e61",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01de1227018684e7eba17a6fd3d02601c7512967b3ce6d7abee2d02ff1b815a2da03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0b7c28c49ea9027aa16c8d7b6bfb425ee484c1a29e0d45de20421428335987e61b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a0851e44981b1e1c0e10825dff9a609f17fbe4c460f63e030b2bef8fd152f640478869959afe7118410ff862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01de1227018684e7eba17a6fd3d02601c7512967b3ce6d7abee2d02ff1b815a2da03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0b7c28c49ea9027aa16c8d7b6bfb425ee484c1a29e0d45de20421428335987e61b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a0699a09c1e6cccec1ef821f3fc7b839160c6b01c50e744a035790ed287398d67088cd697a389eb1b6fcf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x541f8b811fc96cdbeaef4753139ed1e4e97df1700a2146d34f37eb80b8dc40d4",
+        "lastblockhash" : "0x4557693c9467e326842d4d727665ed2598087afbae146035ab3e454e0cd0bbcd",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -121,378 +121,13 @@
             }
         }
     },
-    "delegatecallOOGinCall_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/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json",
-            "sourceHash" : "4f668b5e70ef44957d02fcea4a24a08245098825457ae83ade60588e153c5d9e"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xca0f",
-                    "hash" : "0x66be84264e786e96d0290c5a4cbe3d6075b2c2db22ccadf9019e60867032abda",
-                    "mixHash" : "0x61026fc8bac7ace785cdaee63ecf1f8aad66b3bf5f8228d108be1d52b8fe7667",
-                    "nonce" : "0xcca15131577534b5",
-                    "number" : "0x01",
-                    "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
-                    "receiptTrie" : "0x7e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3",
-                    "stateRoot" : "0x008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a061026fc8bac7ace785cdaee63ecf1f8aad66b3bf5f8228d108be1d52b8fe766788cca15131577534b5f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
-                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x7a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x66be84264e786e96d0290c5a4cbe3d6075b2c2db22ccadf9019e60867032abda",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x6001600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5612710f401600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4ca0f",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76335f1",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x6001600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5612710f401600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "delegatecallOOGinCall_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/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json",
-            "sourceHash" : "4f668b5e70ef44957d02fcea4a24a08245098825457ae83ade60588e153c5d9e"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xca0f",
-                    "hash" : "0xeea9f96ed6af4ee06cae8ef49ce8b38f52fcf2af2cb46727728af3d90b35bc79",
-                    "mixHash" : "0x1423e4d4588d3fa88077ded1b788d9c5ab91a66782537270528268fd17da226a",
-                    "nonce" : "0xda22e11f6dcae339",
-                    "number" : "0x01",
-                    "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
-                    "receiptTrie" : "0x7e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3",
-                    "stateRoot" : "0x008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0008f4f72af007c5e26e58bd1229d519699d45c2854ed4e0179cfecaf400698f5a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07e47c525bc04a95ff46abc87d5d9b597624230f99c43cd439d0ddd4f7a80d2b3b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ca0f8203e880a01423e4d4588d3fa88077ded1b788d9c5ab91a66782537270528268fd17da226a88da22e11f6dcae339f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
-                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x7a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xeea9f96ed6af4ee06cae8ef49ce8b38f52fcf2af2cb46727728af3d90b35bc79",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x6001600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5612710f401600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4ca0f",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a76335f1",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x6001600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5612710f401600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "delegatecallOOGinCall_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/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json",
-            "sourceHash" : "4f668b5e70ef44957d02fcea4a24a08245098825457ae83ade60588e153c5d9e"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x101732a578e95b38df17f56b5d21a1f4b2fa4e5ef187ab0bf06c4b5b2268f2eb",
-                    "mixHash" : "0xc3d8a6ff37c566d707d0c539b061946cd801ce1dfc8872ac41ce559385a0cc5a",
-                    "nonce" : "0xc1e9a075b29ba2e4",
-                    "number" : "0x01",
-                    "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
-                    "receiptTrie" : "0x8e01de64021417f08d843dd5b51a2e18050266ec333434fc5d0fb9422cfebe36",
-                    "stateRoot" : "0x8865be464621b24338631d5f6795e8eaf4aa71c86bad02bb683c7caa2c9ec815",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa08865be464621b24338631d5f6795e8eaf4aa71c86bad02bb683c7caa2c9ec815a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a08e01de64021417f08d843dd5b51a2e18050266ec333434fc5d0fb9422cfebe36b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0c3d8a6ff37c566d707d0c539b061946cd801ce1dfc8872ac41ce559385a0cc5a88c1e9a075b29ba2e4f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
-                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x7a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x101732a578e95b38df17f56b5d21a1f4b2fa4e5ef187ab0bf06c4b5b2268f2eb",
-        "network" : "Frontier",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x6001600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5612710f401600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824521c6c0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7363940",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0186a0",
-                "code" : "0x6001600060006000600073945304eb96065b2a98b57a48a06ae28d285a71b5612710f401600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x6001600155603760005360026000f3",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "delegatecallOOGinCall_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/delegatecallOOGinCall_d0g0v0Filler.json",
-            "sourceHash" : "4f668b5e70ef44957d02fcea4a24a08245098825457ae83ade60588e153c5d9e"
+            "sourceHash" : "b5b65b12d13dfd996ba1027a1bdbdbba6bd0edda5a25c6961fc02b1ba6a935f0"
         },
         "blocks" : [
             {
@@ -503,9 +138,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xc77b",
-                    "hash" : "0x5823da405a75c4bc3954ecfdcca000a082aa8105fd8387fe14126cd7bf8474f9",
-                    "mixHash" : "0x6c6c624757419e1fe8660d7da5d6e78097180922f1f5ffd8651b70cce76869b6",
-                    "nonce" : "0x72b6b0c9fc575239",
+                    "hash" : "0x4e8e7cdaf2033946e3474ef942c72b69ff3e2677d915a0d26d785cac872919e4",
+                    "mixHash" : "0xf6bf7bb672519eccda68ac88d6a023eadaef8a6110ceaa4507290c2c3b57db39",
+                    "nonce" : "0x8145783e359acd7b",
                     "number" : "0x01",
                     "parentHash" : "0x8cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6da",
                     "receiptTrie" : "0x6320fd5201ce4da0e3bc2596fdf6ad1d3cc2c1092999cb4171df2c5256516982",
@@ -514,10 +149,10 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba9af2192d24ad6491dcae75de505f0c3001b4ed48a350d0a8670ca6fb0e3ebaa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a06320fd5201ce4da0e3bc2596fdf6ad1d3cc2c1092999cb4171df2c5256516982b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082c77b8203e880a06c6c624757419e1fe8660d7da5d6e78097180922f1f5ffd8651b70cce76869b68872b6b0c9fc575239f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a08cb8b249df7b1e3c4bb04bbaa83742cccfb4028ba697bfb10ebfc7e5b71fa6daa01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ba9af2192d24ad6491dcae75de505f0c3001b4ed48a350d0a8670ca6fb0e3ebaa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a06320fd5201ce4da0e3bc2596fdf6ad1d3cc2c1092999cb4171df2c5256516982b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082c77b8203e880a0f6bf7bb672519eccda68ac88d6a023eadaef8a6110ceaa4507290c2c3b57db39888145783e359acd7bf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -551,7 +186,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa07a5e22d61cf6a747a2dac878311e5752ae105cafeba5e2292a4b2607890ee015a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x5823da405a75c4bc3954ecfdcca000a082aa8105fd8387fe14126cd7bf8474f9",
+        "lastblockhash" : "0x4e8e7cdaf2033946e3474ef942c72b69ff3e2677d915a0d26d785cac872919e4",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0.json
index dcbf9155a..30425ccec 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0.json
@@ -2,10 +2,10 @@
     "delegatecallSenderCheck_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json",
-            "sourceHash" : "8fac906dd861cd986442a06242db81f75f10223a6c6c80a2a4c761c34c961f75"
+            "sourceHash" : "aecbeb02f921dfa15cb2aec8075447059dadef8a5ee822ea22f7f5ecd11354ad"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf124",
-                    "hash" : "0xdaae173987e0b4cb47da9df0bae77bd3b3296753203d8ade8436a38901f5383e",
-                    "mixHash" : "0x2cce51db5e9e4fb1873762c8dc8db53f5d688ff676f0e7ee7a8b5e3182da0c79",
-                    "nonce" : "0x393ceeb1c66d5727",
+                    "hash" : "0x883eef4eb22ed19e6b09a9d7e616e83f042547b323044011fbefe2edec4ea099",
+                    "mixHash" : "0x97c518c54609398bd93dd28fc234a248291a91f9e0548d55674badefe44e4bed",
+                    "nonce" : "0x417045b9f779026e",
                     "number" : "0x01",
                     "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
                     "receiptTrie" : "0xe212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054be",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094c83508236a1671dd08b3b34b44830a1117f60e6d7d2ae7e341dc3c7bd289baa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0e212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a02cce51db5e9e4fb1873762c8dc8db53f5d688ff676f0e7ee7a8b5e3182da0c7988393ceeb1c66d5727f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa094c83508236a1671dd08b3b34b44830a1117f60e6d7d2ae7e341dc3c7bd289baa03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0e212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a097c518c54609398bd93dd28fc234a248291a91f9e0548d55674badefe44e4bed88417045b9f779026ef862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xdaae173987e0b4cb47da9df0bae77bd3b3296753203d8ade8436a38901f5383e",
+        "lastblockhash" : "0x883eef4eb22ed19e6b09a9d7e616e83f042547b323044011fbefe2edec4ea099",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -122,380 +122,13 @@
             }
         }
     },
-    "delegatecallSenderCheck_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/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json",
-            "sourceHash" : "8fac906dd861cd986442a06242db81f75f10223a6c6c80a2a4c761c34c961f75"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf124",
-                    "hash" : "0xd7f5ddad97dae12c090222384dc09f45805985bbfe1598f69fcba25f48004c59",
-                    "mixHash" : "0x5b0112edf8576cd9cf43c666b2c525c846e1417f9223d19c7b12a554fc11bdb6",
-                    "nonce" : "0xa2545266708ec6e4",
-                    "number" : "0x01",
-                    "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
-                    "receiptTrie" : "0xc753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8b",
-                    "stateRoot" : "0xaad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fb",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fba03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0c753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a05b0112edf8576cd9cf43c666b2c525c846e1417f9223d19c7b12a554fc11bdb688a2545266708ec6e4f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
-                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x44a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344b",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xd7f5ddad97dae12c090222384dc09f45805985bbfe1598f69fcba25f48004c59",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f124",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x33600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7630edc",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x33600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "delegatecallSenderCheck_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/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json",
-            "sourceHash" : "8fac906dd861cd986442a06242db81f75f10223a6c6c80a2a4c761c34c961f75"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf124",
-                    "hash" : "0xc6f285e8f009e86ed0c6835e4f25b996314a0a87c76ad9b654468f94dec5f4ca",
-                    "mixHash" : "0x8df3d192a6bfa45116f27fe7e6c09b38fb19e50f2223b48ab38537180462589b",
-                    "nonce" : "0xa61a9aacee993132",
-                    "number" : "0x01",
-                    "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
-                    "receiptTrie" : "0xc753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8b",
-                    "stateRoot" : "0xaad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fb",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0aad38a0adab66cf1a2bc0c6a26e45b9166af06c98559d8f88e5ec3d0a9ab26fba03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a0c753576bb6990f6d6844754513ae95521c174815fb61bc59506f3808a7e3eb8bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a08df3d192a6bfa45116f27fe7e6c09b38fb19e50f2223b48ab38537180462589b88a61a9aacee993132f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
-                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x44a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344b",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xc6f285e8f009e86ed0c6835e4f25b996314a0a87c76ad9b654468f94dec5f4ca",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f124",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x33600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7630edc",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x33600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "delegatecallSenderCheck_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/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json",
-            "sourceHash" : "8fac906dd861cd986442a06242db81f75f10223a6c6c80a2a4c761c34c961f75"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x71c6b67622d339c84a0ae31b39585d0d38191dc3c3fb3113289f52d97b01514d",
-                    "mixHash" : "0xdf0566388a1136666d5c098f35e3c585e61b50904a54c0d49bf6152d8d255318",
-                    "nonce" : "0x263fe6d91ef8609d",
-                    "number" : "0x01",
-                    "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
-                    "receiptTrie" : "0x8815fa6c43d4c527d183d86595192f8fcb185d7dbe7308aadfc50a6583f54d2b",
-                    "stateRoot" : "0x2f44d3663da5251251721edb03273ffa24d68f75f584f7ed7897f0196e448b66",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02f44d3663da5251251721edb03273ffa24d68f75f584f7ed7897f0196e448b66a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a08815fa6c43d4c527d183d86595192f8fcb185d7dbe7308aadfc50a6583f54d2bb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0df0566388a1136666d5c098f35e3c585e61b50904a54c0d49bf6152d8d25531888263fe6d91ef8609df862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xc980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557",
-                        "s" : "0x5113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x44a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344b",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x71c6b67622d339c84a0ae31b39585d0d38191dc3c3fb3113289f52d97b01514d",
-        "network" : "Frontier",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824521c6c0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x33600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7363940",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x33600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "delegatecallSenderCheck_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/delegatecallSenderCheck_d0g0v0Filler.json",
-            "sourceHash" : "8fac906dd861cd986442a06242db81f75f10223a6c6c80a2a4c761c34c961f75"
+            "sourceHash" : "aecbeb02f921dfa15cb2aec8075447059dadef8a5ee822ea22f7f5ecd11354ad"
         },
         "blocks" : [
             {
@@ -506,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xee90",
-                    "hash" : "0x6c0908c2bf091ee9a4d6f43645800164b709db3550309c3ff809e0a3246807ea",
-                    "mixHash" : "0x13e63ec4e9ac7f2989f9ad3420289e619af83dfd7275a7e42fcc0703f83ba5db",
-                    "nonce" : "0x0e7851eee3cc26a7",
+                    "hash" : "0xb76ef9401fa6501e22eb179563b766a1494d9d547f55ad766298e893c84fd30f",
+                    "mixHash" : "0xfd37537fd4e7704b1bbf01551f47d481d878692dc2c4c4663062cdfc187559ed",
+                    "nonce" : "0x79138b78d63ee55e",
                     "number" : "0x01",
                     "parentHash" : "0x89a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752",
                     "receiptTrie" : "0x7ce5887f67bb3da97d2225fc56666e25961582a7befa60d9f169e1ff139f60e9",
@@ -517,10 +150,10 @@
                     "transactionsTrie" : "0x3c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc4029426907b6c92541a10914e08531bd029c736f98d534c174303bf956795a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07ce5887f67bb3da97d2225fc56666e25961582a7befa60d9f169e1ff139f60e9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ee908203e880a013e63ec4e9ac7f2989f9ad3420289e619af83dfd7275a7e42fcc0703f83ba5db880e7851eee3cc26a7f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
+                "rlp" : "0xf90260f901f8a089a88acda8fb9a3e482e5088b24d8856229047af56fa515bdcc48b871ac54752a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa01dc4029426907b6c92541a10914e08531bd029c736f98d534c174303bf956795a03c263f26889a2249612b8057a77007a00ad873cbf85ba2aced30b5c7feb1c8c8a07ce5887f67bb3da97d2225fc56666e25961582a7befa60d9f169e1ff139f60e9b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ee908203e880a0fd37537fd4e7704b1bbf01551f47d481d878692dc2c4c4663062cdfc187559ed8879138b78d63ee55ef862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8780801ba0c980cc618a5b9cb1ac487e6f794c548f104b18a5987b531cdf3f90d85b4d1557a05113d252a095f1b8a80121f08956f3af1d2ac155ea11d6ed81e1038166096668c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -554,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa044a69611fdaf9846e6fe648c0e2bf7e6042e9d20a80eae1ad74f1ee0126f344ba056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x6c0908c2bf091ee9a4d6f43645800164b709db3550309c3ff809e0a3246807ea",
+        "lastblockhash" : "0xb76ef9401fa6501e22eb179563b766a1494d9d547f55ad766298e893c84fd30f",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0.json
index 2bda4b741..ed2a8fa77 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0.json
@@ -2,10 +2,10 @@
     "delegatecallValueCheck_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json",
-            "sourceHash" : "604f306e51efc1045a70fb9bea7f44c467a84db57b994f791b24107103a942a7"
+            "sourceHash" : "ba3db5085bb192aa02c21d192331fc773c7f877e800ba4ee4b3743cbc146e100"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xf124",
-                    "hash" : "0xe3589b5488543f47042a950f720ad69d4bcd62804bd31bf3a9dbd619a48d66a2",
-                    "mixHash" : "0xba76a2610f5f5baba338d6f7598cbaaaa582307ba4527f5893fd136c8970cc71",
-                    "nonce" : "0xc13cedf665a4a34e",
+                    "hash" : "0x16ef9f97de465a02a99ca41653ec4ac2d8893f6b50c61812ce2b6f47fd1f5270",
+                    "mixHash" : "0xe9cedb8d5177fa5d9fa975e0732808a5dfbed73b8cb08c19bbea5b8c6ae684cb",
+                    "nonce" : "0xc5f3c7d6808ed37c",
                     "number" : "0x01",
                     "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
                     "receiptTrie" : "0xe212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054be",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05329109f0a15c20aebcad2e9f5b98efc9cfef0a1ce0fdf123eeaf3dff3b65c5ba0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a0e212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a0ba76a2610f5f5baba338d6f7598cbaaaa582307ba4527f5893fd136c8970cc7188c13cedf665a4a34ef862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
+                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05329109f0a15c20aebcad2e9f5b98efc9cfef0a1ce0fdf123eeaf3dff3b65c5ba0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a0e212f69db46474cc96aa9e461875d968e77dda08925b88eabace62c9520054beb901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a0e9cedb8d5177fa5d9fa975e0732808a5dfbed73b8cb08c19bbea5b8c6ae684cb88c5f3c7d6808ed37cf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xe3589b5488543f47042a950f720ad69d4bcd62804bd31bf3a9dbd619a48d66a2",
+        "lastblockhash" : "0x16ef9f97de465a02a99ca41653ec4ac2d8893f6b50c61812ce2b6f47fd1f5270",
         "network" : "Byzantium",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
@@ -122,380 +122,13 @@
             }
         }
     },
-    "delegatecallValueCheck_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/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json",
-            "sourceHash" : "604f306e51efc1045a70fb9bea7f44c467a84db57b994f791b24107103a942a7"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf124",
-                    "hash" : "0x80a6d4b3902c612df78371f89fd93973ebbddfb219299c4b5f2a646722915326",
-                    "mixHash" : "0x3af47ad2596e9f02626743437edf4ef003413d968b3c2f823fef2f311f0d8803",
-                    "nonce" : "0x7106af0007bfef77",
-                    "number" : "0x01",
-                    "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
-                    "receiptTrie" : "0x9ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1",
-                    "stateRoot" : "0x89799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a09ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a03af47ad2596e9f02626743437edf4ef003413d968b3c2f823fef2f311f0d8803887106af0007bfef77f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x18d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29",
-                        "s" : "0x415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x17"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xbab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x80a6d4b3902c612df78371f89fd93973ebbddfb219299c4b5f2a646722915326",
-        "network" : "EIP150",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640017",
-                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x17"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f124",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x34600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7630ec5",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x34600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "delegatecallValueCheck_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/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json",
-            "sourceHash" : "604f306e51efc1045a70fb9bea7f44c467a84db57b994f791b24107103a942a7"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0xf124",
-                    "hash" : "0x109141b9a4695f787e2f94bf79e07abeb0fd5598a087caa16af86f1c45239325",
-                    "mixHash" : "0x67326c2d8a4d20464ce332e1a54066e52c11fabc9bf2d97bd2ec58141a44df66",
-                    "nonce" : "0x7ae4920d2dba2639",
-                    "number" : "0x01",
-                    "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
-                    "receiptTrie" : "0x9ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1",
-                    "stateRoot" : "0x89799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa089799512498a65b0fd1ff62eeef7b744005a83e1f6392ff519a143d302d09113a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a09ff5f902742dfa071a9adbcba0eb6a5d2851335aef7d8d9e285d8a4a730088a1b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082f1248203e880a067326c2d8a4d20464ce332e1a54066e52c11fabc9bf2d97bd2ec58141a44df66887ae4920d2dba2639f862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x18d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29",
-                        "s" : "0x415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x17"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xbab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x109141b9a4695f787e2f94bf79e07abeb0fd5598a087caa16af86f1c45239325",
-        "network" : "EIP158",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640017",
-                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x00" : "0x01",
-                    "0x01" : "0x17"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f4f124",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x34600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7630ec5",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x34600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "delegatecallValueCheck_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/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json",
-            "sourceHash" : "604f306e51efc1045a70fb9bea7f44c467a84db57b994f791b24107103a942a7"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x01c9c380",
-                    "gasUsed" : "0x2dc6c0",
-                    "hash" : "0x13dd0d08d1fa33daa4a0e6154cfaea468b2319e2377f15e2ba29284d1a09e075",
-                    "mixHash" : "0x132f422a649004e6403c30d628abd8a9d10c832619fd09a8056d43ebd3278354",
-                    "nonce" : "0x38c1591b814224be",
-                    "number" : "0x01",
-                    "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
-                    "receiptTrie" : "0xa9ea184e08eab8d118cc9d808966cad123fcd54f40bcb82fd5afe74a2285e004",
-                    "stateRoot" : "0x41a339a55c39e77c56ca47cbdc20b57c05ec2eab57b5b35b16db58a1fb9b004c",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90261f901f9a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa041a339a55c39e77c56ca47cbdc20b57c05ec2eab57b5b35b16db58a1fb9b004ca0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a0a9ea184e08eab8d118cc9d808966cad123fcd54f40bcb82fd5afe74a2285e004b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c380832dc6c08203e880a0132f422a649004e6403c30d628abd8a9d10c832619fd09a8056d43ebd32783548838c1591b814224bef862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x2dc6c0",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0x18d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29",
-                        "s" : "0x415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997",
-                        "to" : "0x095e7baea6a6c7c4c2dfeb977efac326af552d87",
-                        "v" : "0x1c",
-                        "value" : "0x17"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x01c9c380",
-            "gasUsed" : "0x00",
-            "hash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xbab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x13dd0d08d1fa33daa4a0e6154cfaea468b2319e2377f15e2ba29284d1a09e075",
-        "network" : "Frontier",
-        "postState" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x456391824521c6c0",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x34600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7363940",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "0x600260006040600073945304eb96065b2a98b57a48a06ae28d285a71b56207a120f4600055",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0x945304eb96065b2a98b57a48a06ae28d285a71b5" : {
-                "balance" : "0x17",
-                "code" : "0x34600155",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x0de0b6b3a7640000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "delegatecallValueCheck_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/delegatecallValueCheck_d0g0v0Filler.json",
-            "sourceHash" : "604f306e51efc1045a70fb9bea7f44c467a84db57b994f791b24107103a942a7"
+            "sourceHash" : "ba3db5085bb192aa02c21d192331fc773c7f877e800ba4ee4b3743cbc146e100"
         },
         "blocks" : [
             {
@@ -506,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x01c9c380",
                     "gasUsed" : "0xee90",
-                    "hash" : "0x2c56cb1682de868d8784d235ddf31a0dedd859f8aa72f10de4e964c3534f68f4",
-                    "mixHash" : "0x0ac5056a101ab51426355615dfa6f44b5172b8597f49c91950841e534ded7b5e",
-                    "nonce" : "0x29f08f8dc87a4c8d",
+                    "hash" : "0xcbcc2bef454b4e2e6785fa794a8aedf33bc1ac65e82c416dc187979730c187b9",
+                    "mixHash" : "0xb0452317fa44ff55efb68bbf375503cd471f1758969c0ea17d8e7478d723cfd7",
+                    "nonce" : "0x25b25ae3e53a4bcd",
                     "number" : "0x01",
                     "parentHash" : "0x097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3",
                     "receiptTrie" : "0x6fbef588fe3d9610c88eae166b1334a38f39ed601aa1c1e80bdc0d0ebf27c19a",
@@ -517,10 +150,10 @@
                     "transactionsTrie" : "0xecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084853c7649f35e55b40e7d0164cf5a3d08e31aceb573d91a6a7e65631ab3b5d8a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a06fbef588fe3d9610c88eae166b1334a38f39ed601aa1c1e80bdc0d0ebf27c19ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ee908203e880a00ac5056a101ab51426355615dfa6f44b5172b8597f49c91950841e534ded7b5e8829f08f8dc87a4c8df862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
+                "rlp" : "0xf90260f901f8a0097ef0ba21a47442de36600c7129ca416d6c76449a37cf1d186c63ebca960ed3a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa084853c7649f35e55b40e7d0164cf5a3d08e31aceb573d91a6a7e65631ab3b5d8a0ecc41202d79471ddac414a9f6b78c22413cdc15f8a8831ba6680181e54079ce3a06fbef588fe3d9610c88eae166b1334a38f39ed601aa1c1e80bdc0d0ebf27c19ab901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000018401c9c38082ee908203e880a0b0452317fa44ff55efb68bbf375503cd471f1758969c0ea17d8e7478d723cfd78825b25ae3e53a4bcdf862f8608001832dc6c094095e7baea6a6c7c4c2dfeb977efac326af552d8717801ca018d22371d62a12d3df7a7865502261adc76367797de4e3af29b161bb908f8d29a0415853720e390bc5d465312e25cf4a013cf4fec4a20357c431fd33c6dfafb997c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x2dc6c0",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -554,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901fbf901f6a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0bab650d3d5174066e7f1c604521aaebbc4c0ea0f706d7690376b80182fed34e2a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b901000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000083020000808401c9c380808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2c56cb1682de868d8784d235ddf31a0dedd859f8aa72f10de4e964c3534f68f4",
+        "lastblockhash" : "0xcbcc2bef454b4e2e6785fa794a8aedf33bc1ac65e82c416dc187979730c187b9",
         "network" : "Homestead",
         "postState" : {
             "0x095e7baea6a6c7c4c2dfeb977efac326af552d87" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0.json
index 49ae07b14..f95d45ad0 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0.json
@@ -2,10 +2,10 @@
     "delegatecodeDynamicCode2SelfCall_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json",
-            "sourceHash" : "9df18344e40a92305408fe58c4edbb6a99cdf0edad7d1a9cf330bb6793d3df82"
+            "sourceHash" : "d07fc0ddc06c777952a4c4dfdb295ed63f0c6f465ab44bd243eebd35ca99a18a"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016e45",
-                    "hash" : "0x946f5d14ce38125c632ac62d6924de9be16396de888a61bd44fcc5c0f769d91b",
-                    "mixHash" : "0xf77332bf378748727253e2cf097ac5990d211dee21fe806b33dd122b0cf4b1ef",
-                    "nonce" : "0xb16f61b62b8fb64a",
+                    "hash" : "0xa789a79565d26c7b6aadf6e3dcefa85fe2c2a7203a50b39c1740b5aa9baa4d43",
+                    "mixHash" : "0xa32948798803f983205fd53e6031ed2001ba975d46cf8ea7cbab31b8321191d4",
+                    "nonce" : "0xddfce015b176a169",
                     "number" : "0x01",
                     "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
                     "receiptTrie" : "0x063791b5d34ea9fb2a657951cd59015baafdbb42b6cecddca08c921da9d49087",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c72c6904e01f772f1aad7b8a125047c95a4c2eaff4fa4cdabcb8bf8d34172cba074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0063791b5d34ea9fb2a657951cd59015baafdbb42b6cecddca08c921da9d49087b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a0f77332bf378748727253e2cf097ac5990d211dee21fe806b33dd122b0cf4b1ef88b16f61b62b8fb64af862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa00c72c6904e01f772f1aad7b8a125047c95a4c2eaff4fa4cdabcb8bf8d34172cba074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0063791b5d34ea9fb2a657951cd59015baafdbb42b6cecddca08c921da9d49087b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a0a32948798803f983205fd53e6031ed2001ba975d46cf8ea7cbab31b8321191d488ddfce015b176a169f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x946f5d14ce38125c632ac62d6924de9be16396de888a61bd44fcc5c0f769d91b",
+        "lastblockhash" : "0xa789a79565d26c7b6aadf6e3dcefa85fe2c2a7203a50b39c1740b5aa9baa4d43",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -115,352 +115,13 @@
             }
         }
     },
-    "delegatecodeDynamicCode2SelfCall_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/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json",
-            "sourceHash" : "9df18344e40a92305408fe58c4edbb6a99cdf0edad7d1a9cf330bb6793d3df82"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x016e45",
-                    "hash" : "0xcf89a7ec64d39fa371e090cc59f5379750b2fff32d15ea1e1c93bbe63227b7dc",
-                    "mixHash" : "0x3ce9c7f1379df3e77d724f28cdf2eb37de0615a92cc58b116c2d3eadeac720cc",
-                    "nonce" : "0xf35b24d4a3be1daf",
-                    "number" : "0x01",
-                    "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
-                    "receiptTrie" : "0x6c40781d4b933d619eb8fff4a3f9ae86722df3a38b389b0e685d8fa501523304",
-                    "stateRoot" : "0x21d8692072d6c0224c66eaee4e3658bba2c06a769a2e6f2f96151b1879fe145e",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa021d8692072d6c0224c66eaee4e3658bba2c06a769a2e6f2f96151b1879fe145ea074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a06c40781d4b933d619eb8fff4a3f9ae86722df3a38b389b0e685d8fa501523304b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a03ce9c7f1379df3e77d724f28cdf2eb37de0615a92cc58b116c2d3eadeac720cc88f35b24d4a3be1daff862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x06e9d9",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
-                        "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x5e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfa",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xcf89a7ec64d39fa371e090cc59f5379750b2fff32d15ea1e1c93bbe63227b7dc",
-        "network" : "EIP150",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x10c8df",
-                "code" : "0x7f60406000604060007313136008b64ff592819b2fa6d43f2835c452020e6201866000527fa0f4600b5533600c550000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
-                "balance" : "0x01",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                    "0x0b" : "0x01",
-                    "0x0c" : "0x1000000000000000000000000000000000000000"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f56e45",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbf91bb",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x10c8e0",
-                "code" : "0x7f60406000604060007313136008b64ff592819b2fa6d43f2835c452020e6201866000527fa0f4600b5533600c550000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fc10000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "delegatecodeDynamicCode2SelfCall_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/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json",
-            "sourceHash" : "9df18344e40a92305408fe58c4edbb6a99cdf0edad7d1a9cf330bb6793d3df82"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x016e45",
-                    "hash" : "0x79060d7f1f1342e77276d6d45d54309ee7ddfad62e7c1bc518f87ac9f976ca11",
-                    "mixHash" : "0xe4bf23b6eea98c06deb24aaadd32800462c641e609ed03c32c4de81047981de0",
-                    "nonce" : "0xfe7b0377e44f7922",
-                    "number" : "0x01",
-                    "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
-                    "receiptTrie" : "0x03a137694bd472d52b0cb297a2ca36b74c33e5e8293d49ebc64b3c260c9835dc",
-                    "stateRoot" : "0xcf36a358606afc23acfbef699fa4ee058e28278b04bebceba1c53dabbf900e81",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0cf36a358606afc23acfbef699fa4ee058e28278b04bebceba1c53dabbf900e81a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a003a137694bd472d52b0cb297a2ca36b74c33e5e8293d49ebc64b3c260c9835dcb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016e458203e880a0e4bf23b6eea98c06deb24aaadd32800462c641e609ed03c32c4de81047981de088fe7b0377e44f7922f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x06e9d9",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
-                        "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x5e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfa",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x79060d7f1f1342e77276d6d45d54309ee7ddfad62e7c1bc518f87ac9f976ca11",
-        "network" : "EIP158",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x10c8df",
-                "code" : "0x7f60406000604060007313136008b64ff592819b2fa6d43f2835c452020e6201866000527fa0f4600b5533600c550000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x13136008b64ff592819b2fa6d43f2835c452020e" : {
-                "balance" : "0x01",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                    "0x0b" : "0x01",
-                    "0x0c" : "0x1000000000000000000000000000000000000000"
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244f56e45",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fbf91bb",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x10c8e0",
-                "code" : "0x7f60406000604060007313136008b64ff592819b2fa6d43f2835c452020e6201866000527fa0f4600b5533600c550000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fc10000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
-    "delegatecodeDynamicCode2SelfCall_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/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json",
-            "sourceHash" : "9df18344e40a92305408fe58c4edbb6a99cdf0edad7d1a9cf330bb6793d3df82"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x06e9d9",
-                    "hash" : "0x2ffe95317a76f16a206f964b1a9ef2971f47df028c1d006bc86ee074111180c2",
-                    "mixHash" : "0xdbb41959253e4947e885a9bfd267a4b6231fee08188eadc4d10951466eefa087",
-                    "nonce" : "0xba48daba28f51acf",
-                    "number" : "0x01",
-                    "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
-                    "receiptTrie" : "0xef0548b634b0b4cd3bd5d2f6b470e47e2236f9784a5b975bdf9d327914a97c65",
-                    "stateRoot" : "0x17c579eef72be6b71d95e31b73fccfa95c138f56bcaecd161190e8c41f805084",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa017c579eef72be6b71d95e31b73fccfa95c138f56bcaecd161190e8c41f805084a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0ef0548b634b0b4cd3bd5d2f6b470e47e2236f9784a5b975bdf9d327914a97c65b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a0dbb41959253e4947e885a9bfd267a4b6231fee08188eadc4d10951466eefa08788ba48daba28f51acff862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x06e9d9",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
-                        "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0x5e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfa",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x2ffe95317a76f16a206f964b1a9ef2971f47df028c1d006bc86ee074111180c2",
-        "network" : "Frontier",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x10c8e0",
-                "code" : "0x7f60406000604060007313136008b64ff592819b2fa6d43f2835c452020e6201866000527fa0f4600b5533600c550000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fae9d9",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fba1627",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x10c8e0",
-                "code" : "0x7f60406000604060007313136008b64ff592819b2fa6d43f2835c452020e6201866000527fa0f4600b5533600c550000000000000000000000000000000000000000000000602052604060006001f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fc10000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "delegatecodeDynamicCode2SelfCall_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode2SelfCall_d0g0v0Filler.json",
-            "sourceHash" : "9df18344e40a92305408fe58c4edbb6a99cdf0edad7d1a9cf330bb6793d3df82"
+            "sourceHash" : "d07fc0ddc06c777952a4c4dfdb295ed63f0c6f465ab44bd243eebd35ca99a18a"
         },
         "blocks" : [
             {
@@ -471,9 +132,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x016bb1",
-                    "hash" : "0x7920b2101866e704dbfe33cf8d7e34192089361a567e6b05891185f68b1b5e03",
-                    "mixHash" : "0xfe20db8f490fc9200e2d4a0eed269901a1254e5c998566b2c6634c6bf217657f",
-                    "nonce" : "0x37a743dda2666f47",
+                    "hash" : "0x94b2ef59765e6ad3c8cd2b4a63258f9f4ea04c5f2b1d67d1602e5d21b9c068a6",
+                    "mixHash" : "0x3ed833bdea0f1f46dc13e2017aa9e93c0178ae1f49ba18a685a63b69020c9b40",
+                    "nonce" : "0xeba795c2654e1745",
                     "number" : "0x01",
                     "parentHash" : "0x7544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91",
                     "receiptTrie" : "0xdb63a9ae01c688446fa1af88371b8007d79e73837c319a97ae7c98c265e1b0e9",
@@ -482,10 +143,10 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a11582ae902477ac92ab4c9fe9c9b4724a69b26a8cf5f2432a591b29578a75b0a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0db63a9ae01c688446fa1af88371b8007d79e73837c319a97ae7c98c265e1b0e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb18203e880a0fe20db8f490fc9200e2d4a0eed269901a1254e5c998566b2c6634c6bf217657f8837a743dda2666f47f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a07544ecde610c9f1e5904ab3ef9c973d1c89ca37ac007e27bb983ea3473f8ab91a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0a11582ae902477ac92ab4c9fe9c9b4724a69b26a8cf5f2432a591b29578a75b0a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a0db63a9ae01c688446fa1af88371b8007d79e73837c319a97ae7c98c265e1b0e9b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083016bb18203e880a03ed833bdea0f1f46dc13e2017aa9e93c0178ae1f49ba18a685a63b69020c9b4088eba795c2654e1745f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -519,7 +180,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa05e7a60ce17417b67ff95745eb0f5eba4022784771cfbe9a6607ce1c422acadfaa056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x7920b2101866e704dbfe33cf8d7e34192089361a567e6b05891185f68b1b5e03",
+        "lastblockhash" : "0x94b2ef59765e6ad3c8cd2b4a63258f9f4ea04c5f2b1d67d1602e5d21b9c068a6",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
diff --git a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0.json b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0.json
index 8644f93c7..7bee3a421 100644
--- a/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0.json
+++ b/BlockchainTests/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0.json
@@ -2,10 +2,10 @@
     "delegatecodeDynamicCode_d0g0v0_Byzantium" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json",
-            "sourceHash" : "082edd0b1f62738f488246e086aeb5fa3890af6e136b36859f7b7c5e2e105efe"
+            "sourceHash" : "61728de321c2e7886627c25c51fad852bec5a559b5460412938bb36b07415715"
         },
         "blocks" : [
             {
@@ -16,9 +16,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01f27b",
-                    "hash" : "0xff63888acfa85efe7e2802693acb53a2044fcf13691d4e8a71340b0b1bfd5c45",
-                    "mixHash" : "0x427810ae3ea3e6b0a916ff33370f4d204e49c53480996807c29125a48f918b33",
-                    "nonce" : "0x5583edde3a338821",
+                    "hash" : "0xcfdf73943bde1941eafdfcb4ac1454fd18284aec740dd64106b65aed95c52065",
+                    "mixHash" : "0x5e6e9be99ef15d692a528c04030e9bea59863233e158e6a08e836dc4dfc169fe",
+                    "nonce" : "0x8e3f12bca6b62837",
                     "number" : "0x01",
                     "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
                     "receiptTrie" : "0x7235c1f013ba5522122c012444665014d7515294077e4217ef21a3d9c84ac777",
@@ -27,10 +27,10 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa000c50710720391826627474d1e006ae2a7731ed5f26f90a5128cd1dd123a139aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07235c1f013ba5522122c012444665014d7515294077e4217ef21a3d9c84ac777b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27b8203e880a0427810ae3ea3e6b0a916ff33370f4d204e49c53480996807c29125a48f918b33885583edde3a338821f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa000c50710720391826627474d1e006ae2a7731ed5f26f90a5128cd1dd123a139aa074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07235c1f013ba5522122c012444665014d7515294077e4217ef21a3d9c84ac777b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27b8203e880a05e6e9be99ef15d692a528c04030e9bea59863233e158e6a08e836dc4dfc169fe888e3f12bca6b62837f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -64,7 +64,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xff63888acfa85efe7e2802693acb53a2044fcf13691d4e8a71340b0b1bfd5c45",
+        "lastblockhash" : "0xcfdf73943bde1941eafdfcb4ac1454fd18284aec740dd64106b65aed95c52065",
         "network" : "Byzantium",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -125,10 +125,10 @@
     "delegatecodeDynamicCode_d0g0v0_EIP150" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json",
-            "sourceHash" : "082edd0b1f62738f488246e086aeb5fa3890af6e136b36859f7b7c5e2e105efe"
+            "sourceHash" : "61728de321c2e7886627c25c51fad852bec5a559b5460412938bb36b07415715"
         },
         "blocks" : [
             {
@@ -139,9 +139,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x028ec6",
-                    "hash" : "0xb6669ee70a8d200c877d0eea55f33e4bf2fa1e36004195ee07bc72072d6cdb1e",
-                    "mixHash" : "0xb489fff7edc99d15f6d4aaa6672c62279e3eaddd6df347ff3662cd33e5734757",
-                    "nonce" : "0x350d29def7bd90b9",
+                    "hash" : "0xa41ed8a19396e04591399bc029f03e36811fe0113d079b5c2e6a4cb93d7b00fd",
+                    "mixHash" : "0x483e8c553341e9dcfc94e8f68443c184f700316e5e70778904906b8263470628",
+                    "nonce" : "0x0a41c4f37cd2fbc3",
                     "number" : "0x01",
                     "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
                     "receiptTrie" : "0x56414a1a3524c84d259d0c47ccf27de2be5be812bf5b67dbe5d237a9ccbf4f7f",
@@ -150,10 +150,10 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa092b28c7929ff02e43be885dcfee7c474b899b57ac028d1b3ba4c100bc8cec4a5a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a056414a1a3524c84d259d0c47ccf27de2be5be812bf5b67dbe5d237a9ccbf4f7fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028ec68203e880a0b489fff7edc99d15f6d4aaa6672c62279e3eaddd6df347ff3662cd33e573475788350d29def7bd90b9f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa092b28c7929ff02e43be885dcfee7c474b899b57ac028d1b3ba4c100bc8cec4a5a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a056414a1a3524c84d259d0c47ccf27de2be5be812bf5b67dbe5d237a9ccbf4f7fb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028ec68203e880a0483e8c553341e9dcfc94e8f68443c184f700316e5e70778904906b8263470628880a41c4f37cd2fbc3f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -187,7 +187,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0xb6669ee70a8d200c877d0eea55f33e4bf2fa1e36004195ee07bc72072d6cdb1e",
+        "lastblockhash" : "0xa41ed8a19396e04591399bc029f03e36811fe0113d079b5c2e6a4cb93d7b00fd",
         "network" : "EIP150",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -250,10 +250,10 @@
     "delegatecodeDynamicCode_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++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json",
-            "sourceHash" : "082edd0b1f62738f488246e086aeb5fa3890af6e136b36859f7b7c5e2e105efe"
+            "sourceHash" : "61728de321c2e7886627c25c51fad852bec5a559b5460412938bb36b07415715"
         },
         "blocks" : [
             {
@@ -264,9 +264,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x01f27b",
-                    "hash" : "0x465a2ed0770c07cdc8bd8de831132858fb0a8831c7b53de09be63dbc6edd56cf",
-                    "mixHash" : "0xd885a8c29285bb330190940889650ab3514695e4193ad9cb49609091265e8c2f",
-                    "nonce" : "0x1cb2dca66f57188f",
+                    "hash" : "0x314c3143b6e14b870c4c6c154c7bcb0634e937923d23ccb2e239668943dab139",
+                    "mixHash" : "0x80cafac1ae4302ba1d80941e493ab97d14b244a53b6ba1b040825448ca09f5e1",
+                    "nonce" : "0xe5f97db546784352",
                     "number" : "0x01",
                     "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
                     "receiptTrie" : "0x0b48d98b0264f915f38661ac64f2505d96984281f4416767310ecd28da6d7a03",
@@ -275,10 +275,10 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec4e67cca01c88771953eb965f9e0492f75c0ad147d07c9b232f9827aa4f5b58a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00b48d98b0264f915f38661ac64f2505d96984281f4416767310ecd28da6d7a03b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27b8203e880a0d885a8c29285bb330190940889650ab3514695e4193ad9cb49609091265e8c2f881cb2dca66f57188ff862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0ec4e67cca01c88771953eb965f9e0492f75c0ad147d07c9b232f9827aa4f5b58a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00b48d98b0264f915f38661ac64f2505d96984281f4416767310ecd28da6d7a03b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408301f27b8203e880a080cafac1ae4302ba1d80941e493ab97d14b244a53b6ba1b040825448ca09f5e188e5f97db546784352f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -312,7 +312,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x465a2ed0770c07cdc8bd8de831132858fb0a8831c7b53de09be63dbc6edd56cf",
+        "lastblockhash" : "0x314c3143b6e14b870c4c6c154c7bcb0634e937923d23ccb2e239668943dab139",
         "network" : "EIP158",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {
@@ -370,120 +370,13 @@
             }
         }
     },
-    "delegatecodeDynamicCode_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/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json",
-            "sourceHash" : "082edd0b1f62738f488246e086aeb5fa3890af6e136b36859f7b7c5e2e105efe"
-        },
-        "blocks" : [
-            {
-                "blockHeader" : {
-                    "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-                    "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-                    "difficulty" : "0x020000",
-                    "extraData" : "",
-                    "gasLimit" : "0x0f4240",
-                    "gasUsed" : "0x06e9d9",
-                    "hash" : "0x3343dbe63b9fda1b64bd444789e1d06593eea08e6b5038f801c6979c411d58fe",
-                    "mixHash" : "0x38bba0c13fb710cad164e27e1d2b057dbacf535306823d8224236c8d38843fd3",
-                    "nonce" : "0x9012283a9cf0458e",
-                    "number" : "0x01",
-                    "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
-                    "receiptTrie" : "0x7e2e550d388a363a6578637fb84781f60765bb5fbb1d5e61e4396ab638897fb0",
-                    "stateRoot" : "0x38a935a9983c82fda91358549e05ce9fa17715d31cd801e9e5a36a925f697035",
-                    "timestamp" : "0x03e8",
-                    "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
-                    "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-                },
-                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa038a935a9983c82fda91358549e05ce9fa17715d31cd801e9e5a36a925f697035a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a07e2e550d388a363a6578637fb84781f60765bb5fbb1d5e61e4396ab638897fb0b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f42408306e9d98203e880a038bba0c13fb710cad164e27e1d2b057dbacf535306823d8224236c8d38843fd3889012283a9cf0458ef862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
-                "transactions" : [
-                    {
-                        "data" : "",
-                        "gasLimit" : "0x06e9d9",
-                        "gasPrice" : "0x01",
-                        "nonce" : "0x00",
-                        "r" : "0xf3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0e",
-                        "s" : "0x332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32",
-                        "to" : "0x1000000000000000000000000000000000000000",
-                        "v" : "0x1b",
-                        "value" : "0x00"
-                    }
-                ],
-                "uncleHeaders" : [
-                ]
-            }
-        ],
-        "genesisBlockHeader" : {
-            "bloom" : "0x00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-            "coinbase" : "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba",
-            "difficulty" : "0x020000",
-            "extraData" : "0x42",
-            "gasLimit" : "0x0f4240",
-            "gasUsed" : "0x00",
-            "hash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
-            "mixHash" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "nonce" : "0x0102030405060708",
-            "number" : "0x00",
-            "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "receiptTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "stateRoot" : "0xf3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0",
-            "timestamp" : "0x03b6",
-            "transactionsTrie" : "0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421",
-            "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
-        },
-        "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3343dbe63b9fda1b64bd444789e1d06593eea08e6b5038f801c6979c411d58fe",
-        "network" : "Frontier",
-        "postState" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x2710",
-                "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f604060006040600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b66201866020527fa0f4600b55000000000000000000000000000000000000000000000000000000604052606060006001f0",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            },
-            "0x2adc25665018aa1fe0e6bc666dac8fc2697ff9ba" : {
-                "balance" : "0x4563918244fae9d9",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fba1627",
-                "code" : "",
-                "nonce" : "0x01",
-                "storage" : {
-                }
-            }
-        },
-        "pre" : {
-            "0x1000000000000000000000000000000000000000" : {
-                "balance" : "0x2710",
-                "code" : "0x7f716860016000553360145560005260096017f36000526012600e6001f0600a556000527f604060006040600073ffe4ebd2a68c02d9dcb0a17283d13346beb2d8b66201866020527fa0f4600b55000000000000000000000000000000000000000000000000000000604052606060006001f0",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            },
-            "0xa94f5374fce5edbc8e2a8697c15331677e6ebf0b" : {
-                "balance" : "0x2386f26fc10000",
-                "code" : "",
-                "nonce" : "0x00",
-                "storage" : {
-                }
-            }
-        }
-    },
     "delegatecodeDynamicCode_d0g0v0_Homestead" : {
         "_info" : {
             "comment" : "",
-            "filledwith" : "cpp-1.3.0+commit.6e0ce939.Linux.g++",
-            "lllcversion" : "Version: 0.4.18-develop.2017.9.25+commit.a72237f2.Linux.g++",
+            "filledwith" : "cpp-1.3.0+commit.8fb57c56.Linux.g++",
+            "lllcversion" : "Version: 0.4.20-develop.2018.1.8+commit.2548228b.Linux.g++",
             "source" : "src/BlockchainTestsFiller/GeneralStateTests/stDelegatecallTestHomestead/delegatecodeDynamicCode_d0g0v0Filler.json",
-            "sourceHash" : "082edd0b1f62738f488246e086aeb5fa3890af6e136b36859f7b7c5e2e105efe"
+            "sourceHash" : "61728de321c2e7886627c25c51fad852bec5a559b5460412938bb36b07415715"
         },
         "blocks" : [
             {
@@ -494,9 +387,9 @@
                     "extraData" : "",
                     "gasLimit" : "0x0f4240",
                     "gasUsed" : "0x028c32",
-                    "hash" : "0x3ccfacd78651d5f7cb4de76c862b18f0c5808445030210cd5bb8b9a9b3e7963c",
-                    "mixHash" : "0x6c6b882a796335b09c78ef76801fab3e9090a9da0cf254a7028aa58a594bf03e",
-                    "nonce" : "0x4d958e3392b8d8d0",
+                    "hash" : "0x912ac247729683908753a074ef0e48dafbb8b6c612ef4fe9cb8fd08b2a332e4f",
+                    "mixHash" : "0x84f959adee98f4bf96c7f422e990e07fa82465efae3e1c845d70430c97b7c138",
+                    "nonce" : "0x9c6171e06ad6098d",
                     "number" : "0x01",
                     "parentHash" : "0x68c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961",
                     "receiptTrie" : "0x0f2a079a763179b1d6f18a216d1d5ad6ba642e214c376bcb2efc2e05130139cc",
@@ -505,10 +398,10 @@
                     "transactionsTrie" : "0x74b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68",
                     "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
                 },
-                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d227594c1ff912cda750304aa48ca62126a69f23d0dda20d7f778796905ab76a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00f2a079a763179b1d6f18a216d1d5ad6ba642e214c376bcb2efc2e05130139ccb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028c328203e880a06c6b882a796335b09c78ef76801fab3e9090a9da0cf254a7028aa58a594bf03e884d958e3392b8d8d0f862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
+                "rlp" : "0xf90260f901f8a068c7fae4456eef4c7d33d9e3a1c5e56352129c5e2f507621f1dba078f4da3961a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa02d227594c1ff912cda750304aa48ca62126a69f23d0dda20d7f778796905ab76a074b39e73f0c67b78fff4eb82226142222765b09c97c66d83d2aa030ec81c4f68a00f2a079a763179b1d6f18a216d1d5ad6ba642e214c376bcb2efc2e05130139ccb90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000001830f424083028c328203e880a084f959adee98f4bf96c7f422e990e07fa82465efae3e1c845d70430c97b7c138889c6171e06ad6098df862f86080018306e9d994100000000000000000000000000000000000000080801ba0f3800914fa5a27a13dc5a4119f11c1ae1c6874ad1e299f13e9f43e96c8bdaa0ea0332b1e65d433906232fbb38ec187498f66c29f6127864d94788d7de5bc1d4d32c0",
                 "transactions" : [
                     {
-                        "data" : "",
+                        "data" : "0x",
                         "gasLimit" : "0x06e9d9",
                         "gasPrice" : "0x01",
                         "nonce" : "0x00",
@@ -542,7 +435,7 @@
             "uncleHash" : "0x1dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347"
         },
         "genesisRLP" : "0xf901faf901f5a00000000000000000000000000000000000000000000000000000000000000000a01dcc4de8dec75d7aab85b567b6ccd41ad312451b948a7413f0a142fd40d49347942adc25665018aa1fe0e6bc666dac8fc2697ff9baa0f3b2b7ea23048e8b37a41b5d5fec51d1fe66dc345c577789e81f667ee63c41f0a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421b90100000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000008302000080830f4240808203b642a056e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421880102030405060708c0c0",
-        "lastblockhash" : "0x3ccfacd78651d5f7cb4de76c862b18f0c5808445030210cd5bb8b9a9b3e7963c",
+        "lastblockhash" : "0x912ac247729683908753a074ef0e48dafbb8b6c612ef4fe9cb8fd08b2a332e4f",
         "network" : "Homestead",
         "postState" : {
             "0x1000000000000000000000000000000000000000" : {